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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
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
This commit is contained in:
Eike Ziller
2012-11-30 16:38:22 +01:00
parent 61c3de01a8 de4fd54c76
commit d719eebfdc
54 changed files with 15167 additions and 5902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()));