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

Merge branch 'qml_renaming'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
This commit is contained in:
Thomas Hartmann
2010-03-01 09:44:00 +01:00
parent 20d21db2d0 c7f7585bda
commit 1f940786fb
117 changed files with 978 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
View File

@@ -113,7 +113,7 @@ void QmlRunControl::slotError(const QString &err)
void QmlRunControl::slotAddToOutputWindow(const QString &line)
{
if (m_debugMode && line.startsWith("QmlDebugServer: Waiting for connection")) {
if (m_debugMode && line.startsWith("QDeclarativeDebugServer: Waiting for connection")) {
Core::ICore *core = Core::ICore::instance();
core->modeManager()->activateMode(Debugger::Constants::MODE_DEBUG);
}