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 - examples/quick/painteditem/textballoons/TextBalloonPlugin/plugin.h | 2 +- examples/quick/painteditem/textballoons/textballoon.json | 1 - examples/tutorials/extending/chapter6-plugins/chartsplugin.h | 2 +- examples/tutorials/extending/chapter6-plugins/chartsplugin.json | 1 - examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h | 2 +- examples/tutorials/gettingStartedQml/filedialog/dialogplugin.json | 1 - src/imports/folderlistmodel/folderlistmodel.json | 1 - src/imports/folderlistmodel/plugin.cpp | 2 +- src/imports/localstorage/localstorage.json | 1 - src/imports/localstorage/plugin.cpp | 2 +- src/imports/testlib/main.cpp | 2 +- src/imports/testlib/testlib.json | 1 - src/imports/xmllistmodel/plugin.cpp | 2 +- src/imports/xmllistmodel/xmllistmodel.json | 1 - src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h | 2 +- src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.json | 2 -- src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h | 2 +- src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json | 1 - tests/auto/qml/qqmlbundle/data/imports/bundletest/empty.json | 1 - tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin.cpp | 2 +- tests/auto/qml/qqmlmoduleplugin/empty.json | 1 - tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.cpp | 2 +- tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.cpp | 2 +- tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.cpp | 2 +- tests/auto/qml/qqmlmoduleplugin/plugin/plugin.cpp | 2 +- tests/auto/qml/qqmlmoduleplugin/pluginMixed/plugin.cpp | 2 +- tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp | 2 +- tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/plugin.cpp | 2 +- tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/plugin.cpp | 2 +- 33 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 examples/qml/cppextensions/imageprovider/imageprovider.json delete mode 100644 examples/qml/cppextensions/plugins/plugin.json delete mode 100644 examples/quick/painteditem/textballoons/textballoon.json delete mode 100644 examples/tutorials/extending/chapter6-plugins/chartsplugin.json delete mode 100644 examples/tutorials/gettingStartedQml/filedialog/dialogplugin.json delete mode 100644 src/imports/folderlistmodel/folderlistmodel.json delete mode 100644 src/imports/localstorage/localstorage.json delete mode 100644 src/imports/testlib/testlib.json delete mode 100644 src/imports/xmllistmodel/xmllistmodel.json delete mode 100644 src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.json delete mode 100644 src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json delete mode 100644 tests/auto/qml/qqmlbundle/data/imports/bundletest/empty.json delete mode 100644 tests/auto/qml/qqmlmoduleplugin/empty.json 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 @@ -{} diff --git a/examples/quick/painteditem/textballoons/TextBalloonPlugin/plugin.h b/examples/quick/painteditem/textballoons/TextBalloonPlugin/plugin.h index c500c1c525..a039339ba4 100644 --- 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 index 0967ef424b..0000000000 --- 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 4db1b01987..0310920c13 100644 --- 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 index 0967ef424b..0000000000 --- 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 fcaa210457..2411b5e8f9 100644 --- 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 index 0967ef424b..0000000000 --- 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 index 0967ef424b..0000000000 --- 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 fd7db4e7f6..1e43a7e44b 100644 --- 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 index 0967ef424b..0000000000 --- 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 4f1808f666..bdb2f80bd8 100644 --- 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 459d34fcc9..1b8487e0e6 100644 --- 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 index 0967ef424b..0000000000 --- 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 58253492e1..9dbe7df762 100644 --- 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 index 0967ef424b..0000000000 --- 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 6c3f3d6943..d868df1fc8 100644 --- 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 index 311847daa5..0000000000 --- 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 6f5f0f462f..a0fc7298ef 100644 --- 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 index 0967ef424b..0000000000 --- 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 index 0967ef424b..0000000000 --- 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 8f94e7e393..bee3809ac5 100644 --- 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 index 0967ef424b..0000000000 --- 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 2d0af471c2..4efaadc820 100644 --- 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 03065b2f27..27fd45439b 100644 --- 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 e2ff43dffe..b5f3d782e0 100644 --- 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 5a91852d22..416e1fdc76 100644 --- 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 66c59fde81..7343bc077f 100644 --- 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 a3142ef9b3..cf1725855f 100644 --- 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 a2262f15d6..98fe67fe5a 100644 --- 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 a5fc6c1d37..32000f29e7 100644 --- 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() -- cgit v1.2.3