diff options
author | hjk <hjk@qt.io> | 2017-11-07 17:55:05 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2017-11-08 13:00:54 +0000 |
commit | 45f73d8729130bb0f0dbfe043a04cff4efa4f70e (patch) | |
tree | e997994ff0af18806fffc766d53e9c30bfde7d54 /src | |
parent | dfbdc1e5438d06ac8de44e8adf0e98dc9cdd066a (diff) |
Debugger: Squash some (wrong) transition warnings on QmlEngine shutdown
Change-Id: I70d735d45012944b55476214c88a27abfd97612a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 3545a749f1..a66a969fc2 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -86,6 +86,7 @@ # define XSDEBUG(s) qDebug() << s #define CB(callback) [this](const QVariantMap &r) { callback(r); } +#define CHECK_STATE(s) do { checkState(s, __FILE__, __LINE__); } while (0) using namespace Core; using namespace ProjectExplorer; @@ -558,6 +559,7 @@ void QmlEngine::stopApplicationLauncher() void QmlEngine::shutdownInferior() { + CHECK_STATE(InferiorShutdownRequested); // End session. // { "seq" : <number>, // "type" : "request", @@ -1029,7 +1031,8 @@ void QmlEngine::quitDebugger() { d->automaticConnect = false; d->retryOnConnectFail = false; - shutdownInferior(); + stopApplicationLauncher(); + closeConnection(); } void QmlEngine::doUpdateLocals(const UpdateParameters ¶ms) |