diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-29 12:28:10 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-30 09:08:55 +0000 |
| commit | 38b14d6646957b2ac4f1d0248a4d0390adb270ab (patch) | |
| tree | 9232c4ff5f6babf62b0c25bb769f338ff46662fd /src/qml/debugger/debugger.pri | |
| parent | 7d8e29534d2bf86cdad8a7a7c4c8b84c60daa42c (diff) | |
Move debugger initialization out of QQmlDebugServer and QQmlEngine
QQmlDebugConnector has to check the parameters before deciding if (and
what kind of) instance to create. It also has to add the services
itself as we don't want to tie a specific implementation of
QQmlDebugConnector to a specific set of services. Logic to load the
services from plugins will be added in a separate change. Integrating
the service initialization with the connector initialization enables us
to load the services before the server thread startsi, which will
simplify the thread synchronization.
QQmlConfigurableDebugService has to recheck for blockingMode once it
gets enabled as it cannot rely on being enabled right away anymore. It
should have done that already before as it's possible to disable and
re-enable services.
Change-Id: I9d161d78836bae10d688a90b4c2a32efed320412
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger/debugger.pri')
| -rw-r--r-- | src/qml/debugger/debugger.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri index d6fb02a122..cbb1646ff6 100644 --- a/src/qml/debugger/debugger.pri +++ b/src/qml/debugger/debugger.pri @@ -1,6 +1,8 @@ contains(QT_CONFIG, no-qml-debug):DEFINES += QT_NO_QML_DEBUGGER SOURCES += \ + $$PWD/qqmldebug.cpp \ + $$PWD/qqmldebugconnector.cpp \ $$PWD/qqmldebugservice.cpp \ $$PWD/qqmlprofilerservice.cpp \ $$PWD/qqmldebugserver.cpp \ |