diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-14 16:36:32 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-30 09:08:49 +0000 |
| commit | 7d8e29534d2bf86cdad8a7a7c4c8b84c60daa42c (patch) | |
| tree | b70aaf67905d8e562519006dee1bc23f6e1bddce /src/quick | |
| parent | 6a00b4d4ead8efa75c312acaff897d96fe79a6d9 (diff) | |
Extract minimal interface from QQmlDebugServer and use it.
This will allow us to move QQmlDebugServer into a plugin. The new QQmlDebugServer
is the interface exposed to connection plugins. The interface exposed to services
is renamed to QQmlDebugConnector, as technically it doesn't have to be a
"server".
Change-Id: Id508b8c0a6960228e889f45a437b73060392db39
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickview.cpp | 6 | ||||
| -rw-r--r-- | src/quick/qtquick2.cpp | 4 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp index 90046fb013..ff1f22589c 100644 --- a/src/quick/items/qquickview.cpp +++ b/src/quick/items/qquickview.cpp @@ -38,7 +38,7 @@ #include "qquickitem_p.h" #include "qquickitemchangelistener_p.h" -#include <private/qqmldebugserver_p.h> +#include <private/qqmldebugconnector_p.h> #include <private/qquickprofiler_p.h> #include <private/qqmlinspectorservice_p.h> #include <private/qqmlmemoryprofiler_p.h> @@ -87,7 +87,7 @@ void QQuickViewPrivate::init(QQmlEngine* e) rootItemMarker.set(v4, v); } - if (QQmlDebugServer::instance()) + if (QQmlDebugConnector::instance()) QQmlInspectorService::instance()->addView(q); } @@ -98,7 +98,7 @@ QQuickViewPrivate::QQuickViewPrivate() QQuickViewPrivate::~QQuickViewPrivate() { - if (QQmlDebugServer::instance()) + if (QQmlDebugConnector::instance()) QQmlInspectorService::instance()->removeView(q_func()); } diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp index e4937e2bf6..3e7811e114 100644 --- a/src/quick/qtquick2.cpp +++ b/src/quick/qtquick2.cpp @@ -39,7 +39,7 @@ #include <private/qquickaccessiblefactory_p.h> #include <private/qqmlenginedebugservice_p.h> -#include <private/qqmldebugserver_p.h> +#include <private/qqmldebugconnector_p.h> #include <private/qqmldebugstatesdelegate_p.h> #include <private/qqmlbinding_p.h> #include <private/qqmlcontext_p.h> @@ -187,7 +187,7 @@ void QQmlQtQuick2Module::defineModule() QAccessible::installFactory(&qQuickAccessibleFactory); #endif - if (QQmlDebugServer::instance()) { + if (QQmlDebugConnector::instance()) { QQmlEngineDebugService::instance()->setStatesDelegate( new QQmlQtQuick2DebugStatesDelegate); QQuickProfiler::initialize(); diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index d43b15e1d3..cc0b81194b 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -55,7 +55,7 @@ #include <private/qquickprofiler_p.h> #include <private/qqmldebugservice_p.h> -#include <private/qqmldebugserver_p.h> +#include <private/qqmldebugconnector_p.h> #include <private/qquickshadereffectnode_p.h> @@ -689,7 +689,7 @@ void QSGRenderThread::run() qCDebug(QSG_LOG_RENDERLOOP) << QSG_RT_PAD << "run()"; animatorDriver = sgrc->sceneGraphContext()->createAnimationDriver(0); animatorDriver->install(); - if (QQmlDebugServer::instance()) + if (QQmlDebugConnector::instance()) QQuickProfiler::registerAnimationCallback(); while (active) { |