From 38fe08b8af9015264a1f8a5f4dcf1dd40f04f4ba Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Tue, 21 Jul 2015 16:39:57 +0200
Subject: [PATCH] Move QQmlConfigurableDebugService into qmltooling/shared

It's only used by plugins now.

Change-Id: Ia73a2a22ba6bccbd85bbca6eda2fb9f5a8d6dd3b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro            | 1 +
 src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h              | 2 +-
 src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro            | 1 +
 src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h          | 2 +-
 .../qmltooling/shared/qqmlconfigurabledebugservice.h}                 | 4 ++--
 src/qml/debugger/debugger.pri                                         | 1 -
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename src/{qml/debugger/qqmlconfigurabledebugservice_p.h => plugins/qmltooling/shared/qqmlconfigurabledebugservice.h} (97%)

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro b/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro
index 951b212..6c29411 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro
+++ b/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro
@@ -13,6 +13,7 @@ SOURCES += \
     $$PWD/qv4debugservice.cpp
 
 HEADERS += \
+    $$PWD/../shared/qqmlconfigurabledebugservice.h \
     $$PWD/qdebugmessageservice.h \
     $$PWD/qqmldebuggerservicefactory.h \
     $$PWD/qqmlenginedebugservice.h \
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
index b009a0f..4829ae4 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <private/qqmlconfigurabledebugservice_p.h>
+#include "qqmlconfigurabledebugservice.h"
 #include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qv4debugging_p.h>
 
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro b/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro
index dc5ee44..e1c4095 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro
+++ b/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro
@@ -13,6 +13,7 @@ SOURCES += \
     $$PWD/qv4profileradapter.cpp
 
 HEADERS += \
+    $$PWD/../shared/qqmlconfigurabledebugservice.h \
     $$PWD/qqmlenginecontrolservice.h \
     $$PWD/qqmlprofileradapter.h \
     $$PWD/qqmlprofilerservice.h \
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
index da96f58..9b139ff 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <private/qqmlconfigurabledebugservice_p.h>
+#include "qqmlconfigurabledebugservice.h"
 #include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qqmlprofilerdefinitions_p.h>
 #include <private/qqmlabstractprofileradapter_p.h>
diff --git a/src/qml/debugger/qqmlconfigurabledebugservice_p.h b/src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h
similarity index 97%
rename from src/qml/debugger/qqmlconfigurabledebugservice_p.h
rename to src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h
index ce7609f..9aa4531 100644
--- a/src/qml/debugger/qqmlconfigurabledebugservice_p.h
+++ b/src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h
@@ -46,8 +46,8 @@
 // We mean it.
 //
 
-#include "qqmldebugservice_p.h"
-#include "qqmldebugconnector_p.h"
+#include <private/qqmldebugservice_p.h>
+#include <private/qqmldebugconnector_p.h>
 #include <QtCore/qmutex.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri
index 7283949..30a44ee 100644
--- a/src/qml/debugger/debugger.pri
+++ b/src/qml/debugger/debugger.pri
@@ -16,7 +16,6 @@ HEADERS += \
     $$PWD/qqmldebugserviceinterfaces_p.h \
     $$PWD/qqmldebugstatesdelegate_p.h \
     $$PWD/qqmldebug.h \
-    $$PWD/qqmlconfigurabledebugservice_p.h \
     $$PWD/qqmlprofilerdefinitions_p.h \
     $$PWD/qqmlabstractprofileradapter_p.h \
     $$PWD/qqmlprofiler_p.h
-- 
2.7.4