Empty JSON files are not needed for the plugin system

Change-Id: I8df57ed1ced8128723d790c30c00ccaba0a2787d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/examples/qml/cppextensions/imageprovider/imageprovider.cpp b/examples/qml/cppextensions/imageprovider/imageprovider.cpp
index d60057e..a203ad8 100644 (file)
--- 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 (file)
index 0967ef4..0000000
--- 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 5e9900c..f20e693 100644 (file)
--- 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 (file)
index 0967ef4..0000000
--- a/examples/qml/cppextensions/plugins/plugin.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/examples/quick/painteditem/textballoons/TextBalloonPlugin/plugin.h b/examples/quick/painteditem/textballoons/TextBalloonPlugin/plugin.h
index c500c1c..a039339 100644 (file)
--- a/examples/quick/painteditem/textballoons/TextBalloonPlugin/plugin.h
+++ b/examples/quick/painteditem/textballoons/TextBalloonPlugin/plugin.h
@@ -46,7 +46,7 @@
 class TextBalloonPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "textballoon.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 public:
     void registerTypes(const char *uri)
     {

diff --git a/examples/quick/painteditem/textballoons/textballoon.json b/examples/quick/painteditem/textballoons/textballoon.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/examples/quick/painteditem/textballoons/textballoon.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/examples/tutorials/extending/chapter6-plugins/chartsplugin.h b/examples/tutorials/extending/chapter6-plugins/chartsplugin.h
index 4db1b01..0310920 100644 (file)
--- a/examples/tutorials/extending/chapter6-plugins/chartsplugin.h
+++ b/examples/tutorials/extending/chapter6-plugins/chartsplugin.h
@@ -46,7 +46,7 @@
 class ChartsPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "chartsplugin.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     void registerTypes(const char *uri);

diff --git a/examples/tutorials/extending/chapter6-plugins/chartsplugin.json b/examples/tutorials/extending/chapter6-plugins/chartsplugin.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/examples/tutorials/extending/chapter6-plugins/chartsplugin.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h b/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
index fcaa210..2411b5e 100644 (file)
--- a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
+++ b/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
@@ -46,7 +46,7 @@
 class DialogPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "dialogplugin.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
     public:
         //registerTypes is inherited from QQmlExtensionPlugin

diff --git a/examples/tutorials/gettingStartedQml/filedialog/dialogplugin.json b/examples/tutorials/gettingStartedQml/filedialog/dialogplugin.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/examples/tutorials/gettingStartedQml/filedialog/dialogplugin.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/src/imports/folderlistmodel/folderlistmodel.json b/src/imports/folderlistmodel/folderlistmodel.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/src/imports/folderlistmodel/folderlistmodel.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp
index fd7db4e..1e43a7e 100644 (file)
--- a/src/imports/folderlistmodel/plugin.cpp
+++ b/src/imports/folderlistmodel/plugin.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 class QmlFolderListModelPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "folderlistmodel.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     virtual void registerTypes(const char *uri)

diff --git a/src/imports/localstorage/localstorage.json b/src/imports/localstorage/localstorage.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/src/imports/localstorage/localstorage.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index 4f1808f..bdb2f80 100644 (file)
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -689,7 +689,7 @@ static QObject *module_api_factory(QQmlEngine *engine, QJSEngine *scriptEngine)
 class QQmlLocalStoragePlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "localstorage.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     QQmlLocalStoragePlugin()

diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index 459d34f..1b8487e 100644 (file)
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -135,7 +135,7 @@ QT_BEGIN_NAMESPACE
 class QTestQmlModule : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "testlib.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     virtual void registerTypes(const char *uri)

diff --git a/src/imports/testlib/testlib.json b/src/imports/testlib/testlib.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/src/imports/testlib/testlib.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/src/imports/xmllistmodel/plugin.cpp b/src/imports/xmllistmodel/plugin.cpp
index 5825349..9dbe7df 100644 (file)
--- a/src/imports/xmllistmodel/plugin.cpp
+++ b/src/imports/xmllistmodel/plugin.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 class QmlXmlListModelPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "xmllistmodel.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     virtual void registerTypes(const char *uri)

diff --git a/src/imports/xmllistmodel/xmllistmodel.json b/src/imports/xmllistmodel/xmllistmodel.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/src/imports/xmllistmodel/xmllistmodel.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
index 6c3f3d6..d868df1 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
@@ -55,7 +55,7 @@ class QtQuick2Plugin : public QObject, public QQmlInspectorInterface
 {
     Q_OBJECT
     Q_DISABLE_COPY(QtQuick2Plugin)
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlInspectorInterface" FILE "qtquick2plugin.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlInspectorInterface")
     Q_INTERFACES(QQmlInspectorInterface)
 
 public:

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.json b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.json
deleted file mode 100644 (file)
index 311847d..0000000
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{}
-

diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
index 6f5f0f4..a0fc729 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
@@ -53,7 +53,7 @@ class QTcpServerConnection : public QObject, public QQmlDebugServerConnection
     Q_OBJECT
     Q_DECLARE_PRIVATE(QTcpServerConnection)
     Q_DISABLE_COPY(QTcpServerConnection)
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlDebugServerConnection" FILE "qtcpserverconnection.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlDebugServerConnection")
     Q_INTERFACES(QQmlDebugServerConnection)
 
 public:

diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/tests/auto/qml/qqmlbundle/data/imports/bundletest/empty.json b/tests/auto/qml/qqmlbundle/data/imports/bundletest/empty.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/tests/auto/qml/qqmlbundle/data/imports/bundletest/empty.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin.cpp b/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin.cpp
index 8f94e7e..bee3809 100644 (file)
--- a/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin.cpp
+++ b/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin.cpp
@@ -64,7 +64,7 @@ private:
 class MyPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "empty.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     MyPlugin()

diff --git a/tests/auto/qml/qqmlmoduleplugin/empty.json b/tests/auto/qml/qqmlmoduleplugin/empty.json
deleted file mode 100644 (file)
index 0967ef4..0000000
--- a/tests/auto/qml/qqmlmoduleplugin/empty.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.cpp b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.cpp
index 2d0af47..4efaadc 100644 (file)
--- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.cpp
@@ -69,7 +69,7 @@ public:
 class MyPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "../empty.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     MyPlugin() {}

diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.cpp
index 03065b2..27fd454 100644 (file)
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.cpp
@@ -66,7 +66,7 @@ private:
 class MyPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "../empty.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     MyPlugin()

diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.cpp
index e2ff43d..b5f3d78 100644 (file)
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.cpp
@@ -66,7 +66,7 @@ private:
 class MyPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "../empty.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     MyPlugin()

diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.cpp
index 5a91852..416e1fd 100644 (file)
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.cpp
@@ -65,7 +65,7 @@ private:
 class MyPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "../empty.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     MyPlugin()

diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/plugin.cpp
index 66c59fd..7343bc0 100644 (file)
--- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/plugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/plugin.cpp
@@ -56,7 +56,7 @@ public:
 class MyMixedPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "../empty.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     MyMixedPlugin()

diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp
index a3142ef..cf17258 100644 (file)
--- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp
@@ -56,7 +56,7 @@ public:
 class MyMixedPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "../empty.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     MyMixedPlugin()

diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/plugin.cpp
index a2262f1..98fe67f 100644 (file)
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/plugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/plugin.cpp
@@ -46,7 +46,7 @@
 class MyPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "../empty.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     void registerTypes(const char *uri)

diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/plugin.cpp
index a5fc6c1..32000f2 100644 (file)
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/plugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/plugin.cpp
@@ -65,7 +65,7 @@ private:
 class MyPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "../empty.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     MyPlugin()