diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-21 10:55:34 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-23 09:05:49 +0100 |
| commit | fb3889a423365b1736cae8850cdb2b3ac77b14a8 (patch) | |
| tree | 65d7c1f7db7de65035ab91a16a136c4556f026bd /examples/declarative/cppextensions/plugins | |
| parent | dc3165178851b9bda71dd238c8a5faca4dfa7a45 (diff) | |
| download | qtdeclarative-fb3889a423365b1736cae8850cdb2b3ac77b14a8.tar.gz | |
Use new plugin system in QtDeclarative.
- Use prefix "org.qt-project" for interfaces.
- Use new macros, add json files.
Change-Id: I53df83f95153c5c9c462098584606284470a5ae0
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'examples/declarative/cppextensions/plugins')
| -rw-r--r-- | examples/declarative/cppextensions/plugins/plugin.cpp | 6 | ||||
| -rw-r--r-- | examples/declarative/cppextensions/plugins/plugin.json | 1 | ||||
| -rw-r--r-- | examples/declarative/cppextensions/plugins/plugins.pro | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp index 6fbf962f4e..4ba0a928eb 100644 --- a/examples/declarative/cppextensions/plugins/plugin.cpp +++ b/examples/declarative/cppextensions/plugins/plugin.cpp @@ -141,6 +141,8 @@ MinuteTimer *TimeModel::timer=0; class QExampleQmlPlugin : public QDeclarativeExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "plugin.json") + public: void registerTypes(const char *uri) { @@ -151,7 +153,3 @@ public: //![plugin] #include "plugin.moc" - -//![export] -Q_EXPORT_PLUGIN2(qmlqtimeexampleplugin, QExampleQmlPlugin); -//![export] diff --git a/examples/declarative/cppextensions/plugins/plugin.json b/examples/declarative/cppextensions/plugins/plugin.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/examples/declarative/cppextensions/plugins/plugin.json @@ -0,0 +1 @@ +{} diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index bdcb62ca8a..a28582a07a 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -7,6 +7,8 @@ TARGET = qmlqtimeexampleplugin SOURCES += plugin.cpp +OTHER_FILES += "plugin.json" + qdeclarativesources.files += \ com/nokia/TimeExample/qmldir \ com/nokia/TimeExample/center.png \ |