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

Debugger: Move part of engine startup to preparation phase

Browse Source 
Change-Id: I414c356cd615096ee68588b839aaf975657fb7f9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2017-04-27 15:39:30 +02:00
parent 009865f8b3
commit e213585910
6 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,8 +266,6 @@ QmlEngine::QmlEngine(const DebuggerRunParameters &startParameters, DebuggerEngin
if (masterEngine)
setMasterEngine(masterEngine);
connect(this, &DebuggerEngine::stateChanged,
this, &QmlEngine::updateCurrentContext);
connect(stackHandler(), &StackHandler::stackChanged,
this, &QmlEngine::updateCurrentContext);
connect(stackHandler(), &StackHandler::currentIndexChanged,
@@ -359,6 +357,8 @@ void QmlEngine::setRunTool(DebuggerRunTool *runTool)
d->startupMessageFilterConnection = connect(
runTool->runControl(), &RunControl::appendMessageRequested,
d, &QmlEnginePrivate::filterApplicationMessage);
connect(runTool, &DebuggerRunTool::stateChanged,
this, &QmlEngine::updateCurrentContext);
}
void QmlEngine::setupInferior()

3
src/plugins/debugger/qml/qmlinspectoragent.cpp
View File

@@ -29,6 +29,7 @@
#include <debugger/debuggeractions.h>
#include <debugger/debuggercore.h>
#include <debugger/debuggerengine.h>
#include <debugger/debuggerruncontrol.h>
#include <debugger/watchhandler.h>
#include <coreplugin/actionmanager/actionmanager.h>
@@ -93,7 +94,7 @@ QmlInspectorAgent::QmlInspectorAgent(QmlEngine *engine, QmlDebugConnection *conn
if (!m_masterEngine->isMasterEngine())
m_masterEngine = m_masterEngine->masterEngine();
connect(m_masterEngine, &DebuggerEngine::stateChanged,
connect(m_masterEngine->runTool(), &DebuggerRunTool::stateChanged,
this, &QmlInspectorAgent::onEngineStateChanged);
auto engineClient1 = new DeclarativeEngineDebugClient(connection);