Merge remote-tracking branch 'origin/3.6'

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

Change-Id: Ibdf433b54e36e58182b7094f78d47ed3e8c81684

1 files changed, 0 insertions, 7 deletions

diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 0b04200725a..dd2bd488c29 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -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"));