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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: Ibdf433b54e36e58182b7094f78d47ed3e8c81684
This commit is contained in:
Eike Ziller
2015-11-12 13:43:08 +01:00
parent 2afae6f2c6 0bcddcd014
commit d13b22e6bc
181 changed files with 13518 additions and 2106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -556,13 +556,6 @@ DebuggerSettings::DebuggerSettings()
item->setCheckable(true);
item->setDefaultValue(false);
insertItem(UseAddressInStackView, item);
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("ListSourceFiles"));
item->setText(tr("List Source Files"));
item->setCheckable(true);
item->setDefaultValue(false);
insertItem(ListSourceFiles, item);
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("SkipKnownFrames"));