diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-21 09:53:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-21 15:34:38 +0100 |
| commit | 650a8ccc21f8e65730afb195b05790e3b3f9985f (patch) | |
| tree | 6d2ba7166b86d2a87a2a934733becaaeb6cd7d26 /src/plugins/qmltooling | |
| parent | 4f3300b7ce5c3138421a21ec83615a536c9fd316 (diff) | |
Use new plugin system in QtQuick1.
- Use prefix "org.qt-project" for interfaces.
- Use new macros, add json files.
Change-Id: I157206ad883be16fb85b9b6bffca7200532561e4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/plugins/qmltooling')
8 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index e4fad4cd..1bf986ce 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -44,6 +44,8 @@ HEADERS += \ editor/colorpickertool.h \ abstracttool.h +OTHER_FILES += qtquick1plugin.json + target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp index 017e738e..acd2f74c 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp @@ -89,5 +89,3 @@ void QtQuick1Plugin::clientMessage(const QByteArray &message) } // namespace QtQuick1 } // namespace QmlJSDebugger - -Q_EXPORT_PLUGIN2(qmldbg_qtquick1, QmlJSDebugger::QtQuick1::QtQuick1Plugin) diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h index 6381c9be..d30ddee5 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h @@ -55,6 +55,7 @@ class QtQuick1Plugin : public QObject, public QDeclarativeInspectorInterface { Q_OBJECT Q_DISABLE_COPY(QtQuick1Plugin) + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeInspectorInterface" FILE "qtquick1plugin.json") Q_INTERFACES(QDeclarativeInspectorInterface) public: diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.json b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.json @@ -0,0 +1 @@ +{} diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index fcce2e8c..a224792d 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -11,6 +11,8 @@ 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 f99825f4..2df31994 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp +++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp @@ -193,7 +193,5 @@ void QTcpServerConnection::newConnection() } } -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 ee3aa250..a5cda10b 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h +++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h @@ -53,9 +53,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 00000000..0967ef42 --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json @@ -0,0 +1 @@ +{} |