diff options
| author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-05 15:26:44 +0000 |
|---|---|---|
| committer | Tarmac <> | 2012-10-05 15:26:44 +0000 |
| commit | a03e7e775a9751f87efb8fd7acf226b5eb25f4e3 (patch) | |
| tree | 7ca7cfb2dd1e42c6c0d45918087c23fbf09dc5ae /libqmenumodel/QMenuModel/plugin.cpp | |
| parent | c3fbab270f60fc374bae50e787e0b2046f127a07 (diff) | |
| parent | 900b75e3528ea23b9158c52e43bca905a1ee5e5f (diff) | |
| download | qmenumodel-a03e7e775a9751f87efb8fd7acf226b5eb25f4e3.tar.gz qmenumodel-a03e7e775a9751f87efb8fd7acf226b5eb25f4e3.tar.bz2 qmenumodel-a03e7e775a9751f87efb8fd7acf226b5eb25f4e3.zip | |
Port to Qt5.
To compile and test, one needs to install the qt5-meta-minimal package from the Canonical Qt5 Edgers PPA (https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta1). This installs Qt5 in /opt/qt5/. cmake needs to be invoked with CMAKE_PREFIX_PATH=/opt/qt5/lib/cmake, and /opt/qt5/bin needs to be added to $PATH if one wants to generate the API documentation using qdoc.. Approved by Renato Araujo Oliveira Filho, jenkins.
Diffstat (limited to 'libqmenumodel/QMenuModel/plugin.cpp')
| -rw-r--r-- | libqmenumodel/QMenuModel/plugin.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp index ec51ae9..26650eb 100644 --- a/libqmenumodel/QMenuModel/plugin.cpp +++ b/libqmenumodel/QMenuModel/plugin.cpp @@ -17,17 +17,21 @@ * Renato Araujo Oliveira Filho <renato@canonical.com> */ +extern "C" { +#include <glib-object.h> +} + #include "plugin.h" #include "qmenumodel.h" #include "qdbusmenumodel.h" #include "qdbusactiongroup.h" #include "qstateaction.h" -#include <QtDeclarative> - +#include <QtQml> void QMenuModelQmlPlugin::registerTypes(const char *uri) { + g_type_init(); qmlRegisterUncreatableType<QMenuModel>(uri, 0, 1, "QMenuModel", "QMenuModel is a interface"); qmlRegisterUncreatableType<QStateAction>(uri, 0, 1, "QStateAction", @@ -40,4 +44,3 @@ void QMenuModelQmlPlugin::registerTypes(const char *uri) } -Q_EXPORT_PLUGIN2(qmenumodel, QMenuModelQmlPlugin) |