diff options
| author | Aurindam Jana <aurindam.jana@digia.com> | 2012-11-27 17:16:57 +0100 |
|---|---|---|
| committer | Aurindam Jana <aurindam.jana@digia.com> | 2012-11-27 17:32:11 +0100 |
| commit | 6bbd80143b69f64036c794041275267431333efc (patch) | |
| tree | ed0129451794762fe5ac217d11d813ff6463ff35 /src/plugins/debugger/qml/qmlcppengine.cpp | |
| parent | e53b4a9c7699bfacd8877b4ad524df2f2ac20a8b (diff) | |
| download | qt-creator-6bbd80143b69f64036c794041275267431333efc.tar.gz | |
QML/JS Console: Update context
Update context from QML object tree or the stack frame
depending upon debugger engine state.
Change-Id: I4e6affba37acc016513ad95cd278a400aaa18c49
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlcppengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlcppengine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 0e3ff39346..15bebbdcf8 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -93,8 +93,7 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp, QString *errorMess { setObjectName(QLatin1String("QmlCppEngine")); d = new QmlCppEnginePrivate; - d->m_qmlEngine = new QmlEngine(sp); - d->m_qmlEngine->setMasterEngine(this); + d->m_qmlEngine = new QmlEngine(sp, this); d->m_cppEngine = DebuggerRunControlFactory::createEngine(sp.firstSlaveEngineType, sp, errorMessage); d->m_cppEngine->setMasterEngine(this); if (!d->m_cppEngine) { |