From fb3889a423365b1736cae8850cdb2b3ac77b14a8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 21 Feb 2012 10:55:34 +0100 Subject: Use new plugin system in QtDeclarative. - Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I53df83f95153c5c9c462098584606284470a5ae0 Reviewed-by: Martin Jones --- src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro | 2 ++ src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp | 2 -- src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h | 1 + src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.json | 2 ++ src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 2 ++ src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp | 2 -- src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h | 2 +- src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json | 1 + 8 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.json create mode 100644 src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json (limited to 'src/plugins/qmltooling') diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro index b9c6584afc..24efee8725 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro @@ -27,5 +27,7 @@ HEADERS += \ ../shared/qdeclarativeinspectorprotocol.h \ ../shared/qmlinspectorconstants.h +OTHER_FILES += qtquick2plugin.json + target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp index 206d0b2eb9..1245a7e690 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp @@ -84,5 +84,3 @@ void QtQuick2Plugin::clientMessage(const QByteArray &message) } // namespace QtQuick2 } // namespace QmlJSDebugger - -Q_EXPORT_PLUGIN2(qmldbg_qtquick2, QmlJSDebugger::QtQuick2::QtQuick2Plugin) diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h index d0f814c03c..f6f668d6b4 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h @@ -55,6 +55,7 @@ class QtQuick2Plugin : public QObject, public QDeclarativeInspectorInterface { Q_OBJECT Q_DISABLE_COPY(QtQuick2Plugin) + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeInspectorInterface" FILE "qtquick2plugin.json") Q_INTERFACES(QDeclarativeInspectorInterface) public: diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.json b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.json new file mode 100644 index 0000000000..311847daa5 --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.json @@ -0,0 +1,2 @@ +{} + diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index 8ab507c055..075cc49ae5 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -14,5 +14,7 @@ SOURCES += \ HEADERS += \ qtcpserverconnection.h +OTHER_FILES += qtcpserverconnection.json + target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp index 529d2094bf..216c2c30b1 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp +++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp @@ -193,7 +193,5 @@ void QTcpServerConnection::invalidPacket() qWarning("QDeclarativeDebugServer: Received a corrupted packet! Giving up ..."); } -Q_EXPORT_PLUGIN2(tcpserver, QTcpServerConnection) - QT_END_NAMESPACE diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h index f090c9709f..1154a0aa25 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h +++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h @@ -54,9 +54,9 @@ class QTcpServerConnection : public QObject, public QDeclarativeDebugServerConne Q_OBJECT Q_DECLARE_PRIVATE(QTcpServerConnection) Q_DISABLE_COPY(QTcpServerConnection) + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeDebugServerConnection" FILE "qtcpserverconnection.json") Q_INTERFACES(QDeclarativeDebugServerConnection) - public: QTcpServerConnection(); ~QTcpServerConnection(); diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json @@ -0,0 +1 @@ +{} -- cgit v1.2.3