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

Merge remote branch 'origin/master' into qmljsinspector

Browse Source 
Conflicts:
	src/plugins/qmlinspector/qmlinspector.cpp
This commit is contained in:
Olivier Goffart
2010-07-08 16:13:14 +02:00
parent 95b0641596 1430358d52
commit 905f2e629b
383 changed files with 15459 additions and 4077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmljsinspector/qmljsinspector.cpp
View File

@@ -451,7 +451,7 @@ void Inspector::debuggerStateChanged(int newState)
m_connectionInitialized = false;
break;
}
case Debugger::AdapterStartFailed:
case Debugger::EngineStartFailed:
case Debugger::InferiorStartFailed:
emit statusMessage(tr("Debugging failed: could not start C++ debugger."));
break;
@@ -522,6 +522,7 @@ void Inspector::setSimpleDockWidgetArrangement()
dockWidget->show();
}
}
mainWindow->splitDockWidget(mainWindow->toolBarDockWidget(), m_propertyWatcherDock, Qt::Vertical);
//mainWindow->tabifyDockWidget(m_frameRateDock, m_propertyWatcherDock);
mainWindow->tabifyDockWidget(m_propertyWatcherDock, m_expressionQueryDock);
mainWindow->tabifyDockWidget(m_propertyWatcherDock, m_inspectorOutputDock);