diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-21 09:53:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-21 15:34:38 +0100 |
| commit | 650a8ccc21f8e65730afb195b05790e3b3f9985f (patch) | |
| tree | 6d2ba7166b86d2a87a2a934733becaaeb6cd7d26 /examples/declarative/tutorials/extending | |
| parent | 4f3300b7ce5c3138421a21ec83615a536c9fd316 (diff) | |
Use new plugin system in QtQuick1.
- Use prefix "org.qt-project" for interfaces.
- Use new macros, add json files.
Change-Id: I157206ad883be16fb85b9b6bffca7200532561e4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'examples/declarative/tutorials/extending')
4 files changed, 5 insertions, 5 deletions
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index 70d4cb47..c2d277f5 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -14,8 +14,6 @@ SOURCES += piechart.cpp \ pieslice.cpp \ chartsplugin.cpp -symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCALLOWDLLDATA = 1 -} +OTHER_FILES += chartsplugin.json + maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp b/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp index 9c4027de..d75f8109 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp @@ -49,6 +49,5 @@ void ChartsPlugin::registerTypes(const char *uri) qmlRegisterType<PieSlice>(uri, 1, 0, "PieSlice"); } -Q_EXPORT_PLUGIN2(chartsplugin, ChartsPlugin); //![0] diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h b/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h index bffcf000..863564b0 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h @@ -46,6 +46,8 @@ class ChartsPlugin : public QDeclarativeExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "chartsplugin.json") + public: void registerTypes(const char *uri); }; diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.json b/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.json @@ -0,0 +1 @@ +{} |