Merge remote branch 'origin/2.2'

Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/projectexplorer/target.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp

1 files changed, 0 insertions, 14 deletions

diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index f10cbb393f..134434dacb 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -266,20 +266,6 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
     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"));
     item->setToolTip(tr("Selecting this causes the C++ Code Model being asked "