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

Merge branch '1.1'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggeractions.cpp

Reviewed-by: hjk
This commit is contained in:
Thorbjørn Lindeijer
2009-04-16 11:20:52 +02:00
parent 7a0baf65e7 ef1311d054
commit bc89f5dc4f
36 changed files with 716 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,6 +250,7 @@ DebuggerSettings *DebuggerSettings::instance()
//
item = new SavedAction(instance);
item->setSettingsKey(debugModeGroup, QLatin1String("Location"));
item->setDefaultValue("gdb");
instance->insertItem(GdbLocation, item);
item = new SavedAction(instance);
@@ -272,11 +273,6 @@ DebuggerSettings *DebuggerSettings::instance()
item->setCheckable(true);
instance->insertItem(UseToolTips, item);
item = new SavedAction(instance);
item->setDefaultValue(QLatin1String("xterm"));
item->setSettingsKey(debugModeGroup, QLatin1String("Terminal"));
instance->insertItem(TerminalApplication, item);
item = new SavedAction(instance);
item->setSettingsKey(debugModeGroup, QLatin1String("ListSourceFiles"));
item->setText(tr("List source files"));
@@ -291,6 +287,7 @@ DebuggerSettings *DebuggerSettings::instance()
item = new SavedAction(instance);
item->setSettingsKey(debugModeGroup, QLatin1String("AllPluginBreakpoints"));
item->setDefaultValue(true);
instance->insertItem(AllPluginBreakpoints, item);
item = new SavedAction(instance);