diff options
| author | hjk <hjk@qt.io> | 2017-11-15 17:12:03 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2017-12-06 13:30:04 +0000 |
| commit | 8f1a161c649d26cd256323d92a20270310738932 (patch) | |
| tree | 8fef5b05acc17e30e3b7c1cf9352b47fbd359e73 /src/plugins/debugger/qml/qmlengine.cpp | |
| parent | 2427f1267f8dc65f2cd442b52fb5554f2cb83a0e (diff) | |
Debugger: Merge EngineSetup and InferiorSetup start phases
It was needed in the past to trigger e.g. gdbserver setup in
remote cases which is nowadays handled by separate RunWorkers.
Change-Id: I30bce071dab0779cce2e7abef7b31550d8539461
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 9f62e03252..69b34659f2 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -322,16 +322,6 @@ void QmlEngine::setState(DebuggerState state, bool forced) updateCurrentContext(); } -void QmlEngine::setupInferior() -{ - QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state()); - - notifyInferiorSetupOk(); - - if (d->automaticConnect) - beginConnection(); -} - void QmlEngine::handleLauncherStarted() { // FIXME: The QmlEngine never calls notifyInferiorPid() triggering the @@ -593,6 +583,9 @@ void QmlEngine::shutdownEngine() void QmlEngine::setupEngine() { notifyEngineSetupOk(); + + if (d->automaticConnect) + beginConnection(); } void QmlEngine::continueInferior() |