diff options
| author | Anselmo L. S. Melo <anselmo.melo@openbossa.org> | 2012-06-22 05:21:07 -0300 |
|---|---|---|
| committer | Luis Gabriel Lima <luis.gabriel@openbossa.org> | 2012-06-22 10:30:57 +0200 |
| commit | ad3f6218ae3a30591df449a994b47ac7182933c8 (patch) | |
| tree | c9aa16fad10a232e16b65cb089f422eb0a483bc8 | |
| parent | e81900984f2448a115328a309395a3fe897921f6 (diff) | |
Update plugins declaration
Q_EXPORT_PLUGIN2 is now deprecated. Q_PLUGIN_METADATA must be used now.
The json files are empty yet.
Change-Id: I6fbec87c9724d04c79fec09281fa8e1e31a2173a
Reviewed-by: Luis Gabriel Lima <luis.gabriel@openbossa.org>
| -rw-r--r-- | src/imports/models/plugin.cpp | 3 | ||||
| -rw-r--r-- | src/imports/models/uiqmlmodelsplugin.json | 1 | ||||
| -rw-r--r-- | src/imports/undo/plugin.cpp | 3 | ||||
| -rw-r--r-- | src/imports/undo/uiqmlundoframeworkplugin.json | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/models/plugin.cpp b/src/imports/models/plugin.cpp index 83bd220..cd79b9e 100644 --- a/src/imports/models/plugin.cpp +++ b/src/imports/models/plugin.cpp @@ -47,6 +47,7 @@ class QmlModelsPlugin : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionPlugin" FILE "uiqmlmodelsplugin.json") public: virtual void registerTypes(const char* uri); @@ -61,5 +62,3 @@ void QmlModelsPlugin::registerTypes(const char* uri) } #include "plugin.moc" - -Q_EXPORT_PLUGIN2(qmlmodelsplugin, QT_PREPEND_NAMESPACE(QmlModelsPlugin)) diff --git a/src/imports/models/uiqmlmodelsplugin.json b/src/imports/models/uiqmlmodelsplugin.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/src/imports/models/uiqmlmodelsplugin.json @@ -0,0 +1 @@ +{} diff --git a/src/imports/undo/plugin.cpp b/src/imports/undo/plugin.cpp index b2d492d..1060522 100644 --- a/src/imports/undo/plugin.cpp +++ b/src/imports/undo/plugin.cpp @@ -48,6 +48,7 @@ class QmlUndoFrameworkPlugin : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionPlugin" FILE "uiqmlundoframeworkplugin.json") public: virtual void registerTypes(const char* uri); @@ -65,4 +66,4 @@ void QmlUndoFrameworkPlugin::registerTypes(const char* uri) #include "plugin.moc" -Q_EXPORT_PLUGIN2(qmlundoframeworkplugin, QT_PREPEND_NAMESPACE(QmlUndoFrameworkPlugin)) +//Q_EXPORT_PLUGIN2(qmlundoframeworkplugin, QT_PREPEND_NAMESPACE(QmlUndoFrameworkPlugin)) diff --git a/src/imports/undo/uiqmlundoframeworkplugin.json b/src/imports/undo/uiqmlundoframeworkplugin.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/src/imports/undo/uiqmlundoframeworkplugin.json @@ -0,0 +1 @@ +{} |