feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Squash some (wrong) transition warnings on QmlEngine shutdown

Browse Source 
Change-Id: I70d735d45012944b55476214c88a27abfd97612a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-11-07 17:55:05 +01:00
parent dfbdc1e543
commit 45f73d8729
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -86,6 +86,7 @@
# define XSDEBUG(s) qDebug() << s # define XSDEBUG(s) qDebug() << s
#define CB(callback) [this](const QVariantMap &r) { callback(r); } #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 Core;
using namespace ProjectExplorer; using namespace ProjectExplorer;
@@ -558,6 +559,7 @@ void QmlEngine::stopApplicationLauncher()
void QmlEngine::shutdownInferior() void QmlEngine::shutdownInferior()
{ {
CHECK_STATE(InferiorShutdownRequested);
// End session. // End session.
// { "seq" : <number>, // { "seq" : <number>,
// "type" : "request", // "type" : "request",
@@ -1029,7 +1031,8 @@ void QmlEngine::quitDebugger()
{ {
d->automaticConnect = false; d->automaticConnect = false;
d->retryOnConnectFail = false; d->retryOnConnectFail = false;
shutdownInferior(); stopApplicationLauncher();
closeConnection();
} }
void QmlEngine::doUpdateLocals(const UpdateParameters &params) void QmlEngine::doUpdateLocals(const UpdateParameters &params)