diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-14 14:45:50 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-04 13:34:26 +0000 |
| commit | 2c0ed9491e55bdc96bc2deb5ec3c40df6e3271f6 (patch) | |
| tree | 029e73dddfb3202acbc2ce862fb68b8ff85146ae /src/quick | |
| parent | 4e6de08ba154e541587b2939137a3da1081750be (diff) | |
Extract minimal abstract interfaces from debug services.
We will access the services' functionality through those interfaces
once they live in their own plugins.
Change-Id: I0a0d7e73c07cb874b3b507cc4a9d304588c87bca
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickview.cpp | 4 | ||||
| -rw-r--r-- | src/quick/qtquick2.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickprofiler.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp index ff1f22589c..2fbd68b688 100644 --- a/src/quick/items/qquickview.cpp +++ b/src/quick/items/qquickview.cpp @@ -88,7 +88,7 @@ void QQuickViewPrivate::init(QQmlEngine* e) } if (QQmlDebugConnector::instance()) - QQmlInspectorService::instance()->addView(q); + QQmlInspectorServiceImpl::instance()->addView(q); } QQuickViewPrivate::QQuickViewPrivate() @@ -99,7 +99,7 @@ QQuickViewPrivate::QQuickViewPrivate() QQuickViewPrivate::~QQuickViewPrivate() { if (QQmlDebugConnector::instance()) - QQmlInspectorService::instance()->removeView(q_func()); + QQmlInspectorServiceImpl::instance()->removeView(q_func()); } void QQuickViewPrivate::execute() diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp index 3e7811e114..acf7c3e3fe 100644 --- a/src/quick/qtquick2.cpp +++ b/src/quick/qtquick2.cpp @@ -188,7 +188,7 @@ void QQmlQtQuick2Module::defineModule() #endif if (QQmlDebugConnector::instance()) { - QQmlEngineDebugService::instance()->setStatesDelegate( + QQmlEngineDebugServiceImpl::instance()->setStatesDelegate( new QQmlQtQuick2DebugStatesDelegate); QQuickProfiler::initialize(); } diff --git a/src/quick/util/qquickprofiler.cpp b/src/quick/util/qquickprofiler.cpp index 7bd32f07e8..c3cd062c60 100644 --- a/src/quick/util/qquickprofiler.cpp +++ b/src/quick/util/qquickprofiler.cpp @@ -127,9 +127,9 @@ qint64 QQuickProfiler::sendMessages(qint64 until, QList<QByteArray> &messages) void QQuickProfiler::initialize() { Q_ASSERT(s_instance == 0); - QQmlProfilerService *service = QQmlProfilerService::instance(); + QQmlProfilerServiceImpl *service = QQmlProfilerServiceImpl::instance(); s_instance = new QQuickProfiler(service); - QQmlProfilerService::instance()->addGlobalProfiler(s_instance); + QQmlProfilerServiceImpl::instance()->addGlobalProfiler(s_instance); } void animationTimerCallback(qint64 delta) |