diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-07-24 20:05:07 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-25 02:15:55 +0200 |
| commit | 2d4f74b7d4a77f3470135e559d619c351cef6788 (patch) | |
| tree | f1db5eefe229408c432e1c260bf6b05929b54d5a /examples/qml | |
| parent | 7daab8039abc32ab5be5706a08cb58905fe0e0b6 (diff) | |
Empty JSON files are not needed for the plugin system
Change-Id: I8df57ed1ced8128723d790c30c00ccaba0a2787d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'examples/qml')
4 files changed, 2 insertions, 4 deletions
diff --git a/examples/qml/cppextensions/imageprovider/imageprovider.cpp b/examples/qml/cppextensions/imageprovider/imageprovider.cpp index d60057e83a..a203ad8053 100644 --- a/examples/qml/cppextensions/imageprovider/imageprovider.cpp +++ b/examples/qml/cppextensions/imageprovider/imageprovider.cpp @@ -87,7 +87,7 @@ public: class ImageProviderExtensionPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "imageprovider.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: void registerTypes(const char *uri) { diff --git a/examples/qml/cppextensions/imageprovider/imageprovider.json b/examples/qml/cppextensions/imageprovider/imageprovider.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/examples/qml/cppextensions/imageprovider/imageprovider.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/examples/qml/cppextensions/plugins/plugin.cpp b/examples/qml/cppextensions/plugins/plugin.cpp index 5e9900cb4f..f20e6935be 100644 --- a/examples/qml/cppextensions/plugins/plugin.cpp +++ b/examples/qml/cppextensions/plugins/plugin.cpp @@ -141,7 +141,7 @@ MinuteTimer *TimeModel::timer=0; class QExampleQmlPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: void registerTypes(const char *uri) diff --git a/examples/qml/cppextensions/plugins/plugin.json b/examples/qml/cppextensions/plugins/plugin.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/examples/qml/cppextensions/plugins/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{} |