diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-14 15:32:33 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-04 13:34:29 +0000 |
| commit | e115fca4af33bee94c5d524e5d7776b1fa6a31a7 (patch) | |
| tree | 016fb9d57e1137957272db71f978e201440c7318 /src/plugins | |
| parent | 2c0ed9491e55bdc96bc2deb5ec3c40df6e3271f6 (diff) | |
Retrieve services from debug connector, not via static instance()
This will allow us to remove the instance() methods and create the
services from factories in plugins. Also, it allows us to remove the
isDebugging member from QQmlEnginePrivate.
Change-Id: Id9d9820a910902ecfdb1e8175e215093ce3d0965
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qmltooling/shared/abstractviewinspector.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp index 1506b04863..003349ef55 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp @@ -37,7 +37,6 @@ #include "inspecttool.h" #include <QtQml/private/qqmlengine_p.h> -#include <QtQml/private/qqmldebugservice_p.h> #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/QQuickView> diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.cpp b/src/plugins/qmltooling/shared/abstractviewinspector.cpp index 6184b4c987..e1b55c8449 100644 --- a/src/plugins/qmltooling/shared/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/shared/abstractviewinspector.cpp @@ -32,7 +32,6 @@ ****************************************************************************/ #include "abstractviewinspector.h" - #include "abstracttool.h" #include <QtCore/QDebug> @@ -40,6 +39,7 @@ #include <QtQml/QQmlComponent> #include <QtCore/private/qabstractanimation_p.h> #include <QtQml/private/qqmlinspectorservice_p.h> +#include <QtQml/private/qqmldebugconnector_p.h> #include <QtQml/private/qqmlcontext_p.h> #include <QtGui/QMouseEvent> @@ -83,7 +83,7 @@ namespace QmlJSDebugger { AbstractViewInspector::AbstractViewInspector(QObject *parent) : QObject(parent), m_enabled(false), - m_debugService(QQmlInspectorServiceImpl::instance()), + m_debugService(QQmlDebugConnector::service<QQmlInspectorServiceImpl>()), m_eventId(0), m_reloadEventId(-1) { |