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

debugger: rename EngineStart to EngineSetup

Browse Source
This commit is contained in:
hjk
2010-07-09 08:48:33 +02:00
parent 3fcafefa9e
commit 6089bc1b9e
18 changed files with 116 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,11 +251,11 @@ void QmlEngine::setupEngine()
m_proc.start(sp.executable, sp.processArgs);
if (!m_proc.waitForStarted()) {
notifyEngineStartFailed();
notifyEngineSetupFailed();
return;
}
#endif
notifyEngineStartOk();
notifyEngineSetupOk();
//m_frameRate = new CanvasFrameRate(0);
//m_frameRate->show();
}
@@ -295,12 +295,12 @@ void QmlEngine::setupConnection()
if (!m_conn->waitForConnected()) {
qDebug() << "CONNECTION FAILED";
notifyEngineStartFailed();
notifyEngineSetupFailed();
return;
}
#endif
notifyEngineStartOk();
notifyEngineSetupOk();
qDebug() << "CONNECTION SUCCESSFUL";
setState(InferiorRunningRequested);
setState(InferiorRunning);
@@ -1253,7 +1253,7 @@ void QmlEngine::debuggerStateChanged(int newState)
if (m_simultaneousCppAndQmlDebugMode) {
switch(newState) {
case Debugger::EngineStarting:
case Debugger::EngineSettingUp:
{
m_connectionInitialized = false;
break;