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/quickwidgets | |
| 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/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 96fd262bfc..26dd4e5b3a 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -39,7 +39,7 @@ #include "private/qquickitemchangelistener_p.h" #include "private/qquickrendercontrol_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> @@ -96,7 +96,7 @@ void QQuickWidgetPrivate::init(QQmlEngine* e) if (!engine.data()->incubationController()) engine.data()->setIncubationController(offscreenWindow->incubationController()); - if (QQmlDebugServer::instance()) + if (QQmlDebugConnector::instance()) QQmlInspectorService::instance()->addView(q); #ifndef QT_NO_DRAGANDDROP @@ -148,7 +148,7 @@ QQuickWidgetPrivate::QQuickWidgetPrivate() QQuickWidgetPrivate::~QQuickWidgetPrivate() { - if (QQmlDebugServer::instance()) + if (QQmlDebugConnector::instance()) QQmlInspectorService::instance()->removeView(q_func()); invalidateRenderControl(); |