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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
This commit is contained in:
con
2011-03-02 11:49:52 +01:00
parent c8f19854f9 4247519b4a
commit 2ca77dfe1e
7 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
View File

@@ -110,6 +110,7 @@ RunControl *MaemoDebugSupport::createDebugRunControl(MaemoRunConfiguration *runC
} else {
params.startMode = AttachToRemote;
}
params.displayName = runConfig->displayName();
DebuggerRunControl * const runControl =
DebuggerPlugin::createDebugger(params, runConfig);