From: Ulf Hermann Date: Wed, 15 Jul 2015 15:00:22 +0000 (+0200) Subject: Move inspector service and QtQuick2 inspector into a common plugin X-Git-Tag: v5.5.90+alpha1~89 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=158b4dccbe7b24168eed05d1eb31065e45168e0e;p=platform%2Fupstream%2Fqtdeclarative.git Move inspector service and QtQuick2 inspector into a common plugin The inspector service doesn't do anything useful without the QtQuick2 plugin and vice versa. This way we can also use the QQmlDebugPluginManager. Change-Id: I78f154dcc9103ec9ec3d2eda216bfb293231583e Reviewed-by: Simon Hausmann --- diff --git a/src/plugins/qmltooling/shared/abstracttool.cpp b/src/plugins/qmltooling/qmldbg_inspector/abstracttool.cpp similarity index 100% rename from src/plugins/qmltooling/shared/abstracttool.cpp rename to src/plugins/qmltooling/qmldbg_inspector/abstracttool.cpp diff --git a/src/plugins/qmltooling/shared/abstracttool.h b/src/plugins/qmltooling/qmldbg_inspector/abstracttool.h similarity index 100% rename from src/plugins/qmltooling/shared/abstracttool.h rename to src/plugins/qmltooling/qmldbg_inspector/abstracttool.h diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp similarity index 99% rename from src/plugins/qmltooling/shared/abstractviewinspector.cpp rename to src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp index e1b55c8..ecbe31f 100644 --- a/src/plugins/qmltooling/shared/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp @@ -33,12 +33,12 @@ #include "abstractviewinspector.h" #include "abstracttool.h" +#include "qqmlinspectorservice.h" #include #include #include #include -#include #include #include diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h similarity index 100% rename from src/plugins/qmltooling/shared/abstractviewinspector.h rename to src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp b/src/plugins/qmltooling/qmldbg_inspector/highlight.cpp similarity index 100% rename from src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp rename to src/plugins/qmltooling/qmldbg_inspector/highlight.cpp diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h b/src/plugins/qmltooling/qmldbg_inspector/highlight.h similarity index 100% rename from src/plugins/qmltooling/qmldbg_qtquick2/highlight.h rename to src/plugins/qmltooling/qmldbg_inspector/highlight.h diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp similarity index 100% rename from src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp rename to src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h b/src/plugins/qmltooling/qmldbg_inspector/inspecttool.h similarity index 100% rename from src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h rename to src/plugins/qmltooling/qmldbg_inspector/inspecttool.h diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro new file mode 100644 index 0000000..3a1de3f --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -0,0 +1,30 @@ +TARGET = qmldbg_inspector +QT += qml-private quick-private core-private gui-private + +PLUGIN_TYPE = qmltooling +PLUGIN_CLASS_NAME = QQmlInspectorServiceFactory +load(qt_plugin) + +INCLUDEPATH *= $$PWD $$PWD/../shared + +SOURCES += \ + $$PWD/qtquick2plugin.cpp \ + $$PWD/highlight.cpp \ + $$PWD/qquickviewinspector.cpp \ + $$PWD/abstracttool.cpp \ + $$PWD/abstractviewinspector.cpp \ + $$PWD/inspecttool.cpp \ + $$PWD/qqmlinspectorservice.cpp + +HEADERS += \ + $$PWD/qtquick2plugin.h \ + $$PWD/highlight.h \ + $$PWD/qquickviewinspector.h \ + $$PWD/qqmlinspectorservice.h \ + $$PWD/abstracttool.h \ + $$PWD/abstractviewinspector.h \ + $$PWD/qqmlinspectorinterface.h \ + $$PWD/inspecttool.h + +OTHER_FILES += \ + qqmlinspectorservice.json diff --git a/src/qml/debugger/qqmlinspectorinterface_p.h b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorinterface.h similarity index 91% rename from src/qml/debugger/qqmlinspectorinterface_p.h rename to src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorinterface.h index 9b29d38..cd9acab 100644 --- a/src/qml/debugger/qqmlinspectorinterface_p.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorinterface.h @@ -50,8 +50,7 @@ QT_BEGIN_NAMESPACE - -class Q_QML_PRIVATE_EXPORT QQmlInspectorInterface +class QQmlInspectorInterface { public: QQmlInspectorInterface() {} @@ -65,10 +64,6 @@ public: virtual void clientMessage(const QByteArray &message) = 0; }; -#define QQmlInspectorInterface_iid "org.qt-project.Qt.QQmlInspectorInterface" - -Q_DECLARE_INTERFACE(QQmlInspectorInterface, QQmlInspectorInterface_iid) - QT_END_NAMESPACE #endif // QQMLINSPECTORINTERFACE_H diff --git a/src/qml/debugger/qqmlinspectorservice.cpp b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp similarity index 65% rename from src/qml/debugger/qqmlinspectorservice.cpp rename to src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp index f3ff13a..848e635 100644 --- a/src/qml/debugger/qqmlinspectorservice.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp @@ -31,8 +31,9 @@ ** ****************************************************************************/ -#include "qqmlinspectorservice_p.h" -#include "qqmlinspectorinterface_p.h" +#include "qqmlinspectorservice.h" +#include "qqmlinspectorinterface.h" +#include "qtquick2plugin.h" #include @@ -41,23 +42,11 @@ #include #include -#ifndef QT_NO_LIBRARY -// print detailed information about loading of plugins -DEFINE_BOOL_CONFIG_OPTION(qmlDebugVerbose, QML_DEBUGGER_VERBOSE) -#endif - QT_BEGIN_NAMESPACE -Q_GLOBAL_STATIC(QQmlInspectorServiceImpl, serviceInstance) - -QQmlInspectorServiceImpl::QQmlInspectorServiceImpl(): QQmlInspectorService(1), - m_currentInspectorPlugin(0) -{ -} - -QQmlInspectorServiceImpl *QQmlInspectorServiceImpl::instance() +QQmlInspectorServiceImpl::QQmlInspectorServiceImpl(QObject *parent): + QQmlInspectorService(1, parent), m_currentInspectorPlugin(0) { - return serviceInstance(); } void QQmlInspectorServiceImpl::addView(QObject *view) @@ -130,46 +119,12 @@ void QQmlInspectorServiceImpl::processMessage(const QByteArray &message) void QQmlInspectorServiceImpl::loadInspectorPlugins() { -#ifndef QT_NO_LIBRARY - QStringList pluginCandidates; - const QStringList paths = QCoreApplication::libraryPaths(); - foreach (const QString &libPath, paths) { - const QDir dir(libPath + QLatin1String("/qmltooling")); - if (dir.exists()) - foreach (const QString &pluginPath, dir.entryList(QDir::Files)) - pluginCandidates << dir.absoluteFilePath(pluginPath); - } - - foreach (const QString &pluginPath, pluginCandidates) { - if (qmlDebugVerbose()) - qDebug() << "QQmlInspector: Trying to load plugin " << pluginPath << "..."; - - QPluginLoader loader(pluginPath); - if (loader.metaData()[QLatin1String("IID")] != - QLatin1String("org.qt-project.Qt.QQmlInspectorInterface")) - continue; - - if (!loader.load()) { - if (qmlDebugVerbose()) - qDebug() << "QQmlInspector: Error while loading: " << loader.errorString(); - - continue; - } + m_inspectorPlugins << new QmlJSDebugger::QtQuick2Plugin; +} - QQmlInspectorInterface *inspector = - qobject_cast(loader.instance()); - if (inspector) { - if (qmlDebugVerbose()) - qDebug() << "QQmlInspector: Plugin successfully loaded."; - m_inspectorPlugins << inspector; - } else { - if (qmlDebugVerbose()) - qDebug() << "QQmlInspector: Plugin does not implement interface QQmlInspectorInterface."; - - loader.unload(); - } - } -#endif +QQmlDebugService *QQmlInspectorServiceFactory::create(const QString &key) +{ + return key == QQmlInspectorServiceImpl::s_key ? new QQmlInspectorServiceImpl(this) : 0; } QT_END_NAMESPACE diff --git a/src/qml/debugger/qqmlinspectorservice_p.h b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.h similarity index 84% rename from src/qml/debugger/qqmlinspectorservice_p.h rename to src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.h index 61a350c..72243cb 100644 --- a/src/qml/debugger/qqmlinspectorservice_p.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.h @@ -45,8 +45,8 @@ // We mean it. // -#include "qqmldebugservice_p.h" -#include "qqmldebugserviceinterfaces_p.h" +#include +#include #include #include @@ -57,13 +57,12 @@ namespace QmlJSDebugger { class AbstractViewInspector; } class QQmlInspectorInterface; -class Q_QML_PRIVATE_EXPORT QQmlInspectorServiceImpl : public QQmlInspectorService +class QQmlInspectorServiceImpl : public QQmlInspectorService { Q_OBJECT public: - QQmlInspectorServiceImpl(); - static QQmlInspectorServiceImpl *instance(); + QQmlInspectorServiceImpl(QObject *parent = 0); void addView(QObject *); void removeView(QObject *); @@ -78,6 +77,7 @@ private Q_SLOTS: private: friend class QmlJSDebugger::AbstractViewInspector; + friend class QQmlInspectorServiceFactory; void loadInspectorPlugins(); QList m_views; @@ -85,6 +85,14 @@ private: QList m_inspectorPlugins; }; +class QQmlInspectorServiceFactory : public QQmlDebugServiceFactory +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID QQmlDebugServiceFactory_iid FILE "qqmlinspectorservice.json") +public: + QQmlDebugService *create(const QString &key); +}; + QT_END_NAMESPACE #endif // QQMLINSPECTORSERVICE_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.json b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.json new file mode 100644 index 0000000..9ace8da --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "QmlInspector" ] +} diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qquickviewinspector.cpp similarity index 100% rename from src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp rename to src/plugins/qmltooling/qmldbg_inspector/qquickviewinspector.cpp diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/qquickviewinspector.h similarity index 100% rename from src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h rename to src/plugins/qmltooling/qmldbg_inspector/qquickviewinspector.h diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick2plugin.cpp similarity index 97% rename from src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp rename to src/plugins/qmltooling/qmldbg_inspector/qtquick2plugin.cpp index 2bfb0a3..197e618 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick2plugin.cpp @@ -33,9 +33,9 @@ #include "qtquick2plugin.h" #include "qquickviewinspector.h" +#include "qqmlinspectorservice.h" #include -#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick2plugin.h similarity index 93% rename from src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h rename to src/plugins/qmltooling/qmldbg_inspector/qtquick2plugin.h index 6f4d720..7334cc0 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick2plugin.h @@ -35,7 +35,7 @@ #define QTQUICK2PLUGINPLUGIN_H #include -#include +#include "qqmlinspectorinterface.h" QT_BEGIN_NAMESPACE @@ -47,8 +47,6 @@ class QtQuick2Plugin : public QObject, public QQmlInspectorInterface { Q_OBJECT Q_DISABLE_COPY(QtQuick2Plugin) - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlInspectorInterface") - Q_INTERFACES(QQmlInspectorInterface) public: QtQuick2Plugin(); diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro deleted file mode 100644 index 798c512..0000000 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro +++ /dev/null @@ -1,26 +0,0 @@ -TARGET = qmldbg_qtquick2 -QT += qml-private quick-private core-private gui-private - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QtQuick2Plugin -load(qt_plugin) - -INCLUDEPATH *= $$PWD $$PWD/../shared - -SOURCES += \ - qtquick2plugin.cpp \ - highlight.cpp \ - qquickviewinspector.cpp \ - ../shared/abstracttool.cpp \ - ../shared/abstractviewinspector.cpp \ - inspecttool.cpp - -HEADERS += \ - qtquick2plugin.h \ - highlight.h \ - qquickviewinspector.h \ - ../shared/abstracttool.h \ - ../shared/abstractviewinspector.h \ - inspecttool.h - -OTHER_FILES += qtquick2plugin.json diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro index 64069d1..6af954c 100644 --- a/src/plugins/qmltooling/qmltooling.pro +++ b/src/plugins/qmltooling/qmltooling.pro @@ -5,4 +5,4 @@ SUBDIRS += \ qmldbg_server \ qmldbg_tcp -qtHaveModule(quick): SUBDIRS += qmldbg_qtquick2 +qtHaveModule(quick): SUBDIRS += qmldbg_inspector diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri index 1488a4d..b401216 100644 --- a/src/qml/debugger/debugger.pri +++ b/src/qml/debugger/debugger.pri @@ -6,7 +6,6 @@ SOURCES += \ $$PWD/qqmldebugservice.cpp \ $$PWD/qqmldebugserviceinterfaces.cpp \ $$PWD/qqmlprofilerservice.cpp \ - $$PWD/qqmlinspectorservice.cpp \ $$PWD/qqmlenginedebugservice.cpp \ $$PWD/qdebugmessageservice.cpp \ $$PWD/qv4debugservice.cpp \ @@ -24,8 +23,6 @@ HEADERS += \ $$PWD/qqmlprofilerservice_p.h \ $$PWD/qqmldebugserviceinterfaces_p.h \ $$PWD/qqmldebugstatesdelegate_p.h \ - $$PWD/qqmlinspectorservice_p.h \ - $$PWD/qqmlinspectorinterface_p.h \ $$PWD/qqmlenginedebugservice_p.h \ $$PWD/qqmldebug.h \ $$PWD/qdebugmessageservice_p.h \ diff --git a/src/qml/debugger/qqmldebugconnector.cpp b/src/qml/debugger/qqmldebugconnector.cpp index 72754ec..e1dabb4 100644 --- a/src/qml/debugger/qqmldebugconnector.cpp +++ b/src/qml/debugger/qqmldebugconnector.cpp @@ -36,7 +36,6 @@ #include "qdebugmessageservice_p.h" #include "qqmlenginecontrolservice_p.h" #include "qqmlenginedebugservice_p.h" -#include "qqmlinspectorservice_p.h" #include "qqmlprofilerservice_p.h" #include "qv4debugservice_p.h" #include "qqmldebugservicefactory_p.h" @@ -56,6 +55,8 @@ Q_QML_DEBUG_PLUGIN_LOADER(QQmlDebugConnector) Q_QML_IMPORT_DEBUG_PLUGIN(QQmlDebugServerFactory) Q_QML_DEBUG_PLUGIN_LOADER(QQmlDebugService) +Q_QML_IMPORT_DEBUG_PLUGIN(QQmlInspectorServiceFactory) + struct QQmlDebugConnectorParams { QString pluginKey; QString arguments; @@ -123,7 +124,6 @@ QQmlDebugConnector *QQmlDebugConnector::instance() QQmlProfilerServiceImpl::instance(); QDebugMessageService::instance(); QQmlEngineControlService::instance(); - QQmlInspectorServiceImpl::instance(); foreach (const QJsonObject &object, metaDataForQQmlDebugService()) { foreach (const QJsonValue &key, object.value(QLatin1String("MetaData")).toObject()