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

QmlEngine: Engine State transitions

Browse Source 
Rectify wrong state transitions for "Attach to QML Port".

Change-Id: Ife55344fb5089513743ff14f6bb5f2cabeed0adb
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Aurindam Jana
2011-10-19 17:49:24 +02:00
committed by Aurindam Jana
parent cfb8417dec
commit a0134647c3
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,7 +198,8 @@ void QmlEngine::connectionEstablished()
} }
connect(watchersModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers())); connect(watchersModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers()));
notifyEngineRunAndInferiorRunOk(); if (state() == EngineRunRequested)
notifyEngineRunAndInferiorRunOk();
} }
void QmlEngine::beginConnection() void QmlEngine::beginConnection()
@@ -247,7 +248,12 @@ void QmlEngine::retryMessageBoxFinished(int result)
// fall through // fall through
} }
default: default:
if (state() == InferiorRunOk) {
notifyInferiorSpontaneousStop();
notifyInferiorIll();
} else {
notifyEngineRunFailed(); notifyEngineRunFailed();
}
break; break;
} }
} }