diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-21 16:39:57 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-04 13:35:28 +0000 |
| commit | 38fe08b8af9015264a1f8a5f4dcf1dd40f04f4ba (patch) | |
| tree | 60b9d8c3902272f1653de43e21211ef5f5e14b7a /src | |
| parent | 5652c4163f94aaf4bd9cef994be2ae8e7f4096c5 (diff) | |
Move QQmlConfigurableDebugService into qmltooling/shared
It's only used by plugins now.
Change-Id: Ia73a2a22ba6bccbd85bbca6eda2fb9f5a8d6dd3b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro | 1 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro | 1 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h (renamed from src/qml/debugger/qqmlconfigurabledebugservice_p.h) | 4 | ||||
| -rw-r--r-- | src/qml/debugger/debugger.pri | 1 |
6 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro b/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro index 951b212d17..6c29411981 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 b009a0fead..4829ae414f 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 dc5ee44711..e1c4095d88 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 da96f58ce6..9b139ffabb 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 index ce7609f830..9aa4531428 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 728394916c..30a44eedd1 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 |