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

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/projectexplorer/target.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
This commit is contained in:
con
2011-04-27 11:27:29 +02:00
parent 80ef07dce3 a130ebf413
commit 14487af86c
21 changed files with 77 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/debuggeractions.cpp
View File

@@ -265,20 +265,6 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
item->setValue(true);
insertItem(UseDebuggingHelpers, item);
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("UseCustomDebuggingHelperLocation"));
item->setCheckable(true);
item->setDefaultValue(false);
item->setValue(false);
insertItem(UseCustomDebuggingHelperLocation, item);
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("CustomDebuggingHelperLocation"));
item->setCheckable(true);
item->setDefaultValue(QString());
item->setValue(QString());
insertItem(CustomDebuggingHelperLocation, item);
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("UseCodeModel"));
item->setText(tr("Use Code Model"));