diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-30 16:38:22 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-30 17:02:35 +0100 |
| commit | d719eebfdc6cf4d2a97b4273f36e58d321a13a59 (patch) | |
| tree | 6e6092c9cf0660eb08c7c867e3d6c541b0b25d1e /src/plugins/debugger/qml/qmlengine.cpp | |
| parent | 61c3de01a801241911e2469784e3dad8374d2121 (diff) | |
| parent | de4fd54c7629c164cc2871590b64c6d63c6c18b4 (diff) | |
| download | qt-creator-d719eebfdc6cf4d2a97b4273f36e58d321a13a59.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/coreplugin/editormanager/openeditorsview.cpp
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/debugger/qml/qmlinspectoradapter.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/exampleslistmodel.h
src/plugins/welcome/welcomeplugin.cpp
Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 6e2885694b..01d993c91c 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -274,7 +274,7 @@ QmlJS::ConsoleManagerInterface *qmlConsoleManager() // /////////////////////////////////////////////////////////////////////// -QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters) +QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters, DebuggerEngine *masterEngine) : DebuggerEngine(startParameters) , m_adapter(this) , m_inspectorAdapter(&m_adapter, this) @@ -283,6 +283,9 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters) { setObjectName(QLatin1String("QmlEngine")); + if (masterEngine) + setMasterEngine(masterEngine); + connect(&m_adapter, SIGNAL(connectionError(QAbstractSocket::SocketError)), SLOT(connectionError(QAbstractSocket::SocketError))); connect(&m_adapter, SIGNAL(serviceConnectionError(QString)), @@ -292,9 +295,9 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters) connect(&m_adapter, SIGNAL(connectionStartupFailed()), SLOT(connectionStartupFailed())); - connect(this, SIGNAL(stateChanged(Debugger::DebuggerState)), + connect(stackHandler(), SIGNAL(stackChanged()), SLOT(updateCurrentContext())); - connect(this->stackHandler(), SIGNAL(currentIndexChanged()), + connect(stackHandler(), SIGNAL(currentIndexChanged()), SLOT(updateCurrentContext())); connect(inspectorTreeView(), SIGNAL(currentIndexChanged(QModelIndex)), SLOT(updateCurrentContext())); |