From 2d4f74b7d4a77f3470135e559d619c351cef6788 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Tue, 24 Jul 2012 20:05:07 +1000 Subject: Empty JSON files are not needed for the plugin system Change-Id: I8df57ed1ced8128723d790c30c00ccaba0a2787d Reviewed-by: Friedemann Kleint --- examples/qml/cppextensions/imageprovider/imageprovider.cpp | 2 +- examples/qml/cppextensions/imageprovider/imageprovider.json | 1 - examples/qml/cppextensions/plugins/plugin.cpp | 2 +- examples/qml/cppextensions/plugins/plugin.json | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 examples/qml/cppextensions/imageprovider/imageprovider.json delete mode 100644 examples/qml/cppextensions/plugins/plugin.json (limited to 'examples/qml') 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 @@ -{} -- cgit v1.2.3