Merge remote branch 'origin/2.1'

Conflicts:
	src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp

3 files changed, 6 insertions, 15 deletions

diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp
index 16d3a26855..6918f23c20 100644
--- a/src/plugins/debugger/gdb/classicgdbengine.cpp
+++ b/src/plugins/debugger/gdb/classicgdbengine.cpp
@@ -569,17 +569,6 @@ void GdbEngine::tryQueryDebuggingHelpersClassic()
         CB(handleQueryDebuggingHelperClassic));
 }
 
-void GdbEngine::recheckDebuggingHelperAvailabilityClassic()
-{
-    PRECONDITION;
-    if (m_gdbAdapter->dumperHandling() != AbstractGdbAdapter::DumperNotAvailable) {
-        // Retrieve list of dumpable classes.
-        postCommand("call (void*)qDumpObjectData440(1,0,0,0,0,0,0,0)");
-        postCommand("p (char*)&qDumpOutBuffer",
-            CB(handleQueryDebuggingHelperClassic));
-    }
-}
-
 // Called from CoreAdapter and AttachAdapter
 void GdbEngine::updateAllClassic()
 {
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 27311de6e8..739e37bec3 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1781,8 +1781,6 @@ void GdbEngine::setupEngine()
                 this, SLOT(setUseDebuggingHelpers(QVariant)));
         connect(theDebuggerAction(DebugDebuggingHelpers), SIGNAL(valueChanged(QVariant)),
                 this, SLOT(setDebugDebuggingHelpersClassic(QVariant)));
-        connect(theDebuggerAction(RecheckDebuggingHelpers), SIGNAL(triggered()),
-                this, SLOT(recheckDebuggingHelperAvailabilityClassic()));
     }
 
     QTC_ASSERT(state() == EngineSetupRequested, /**/);
@@ -2146,8 +2144,13 @@ static inline QByteArray bpAddressSpec(quint64 address)
 
 QByteArray GdbEngine::breakpointLocation(const BreakpointData *data)
 {
-    if (!data->funcName.isEmpty())
+    if (!data->funcName.isEmpty()) {
+        if (data->funcName == QLatin1String(BreakpointData::throwFunction))
+            return QByteArray("__cxa_throw");
+        if (data->funcName == QLatin1String(BreakpointData::catchFunction))
+            return QByteArray("__cxa_begin_catch");
         return data->funcName.toLatin1();
+    }
     if (data->address)
         return bpAddressSpec(data->address);
     // In this case, data->funcName is something like '*0xdeadbeef'
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index c4b90b80da..210b1c6781 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -516,7 +516,6 @@ private: ////////// View & Data Stuff //////////
     void setDebuggingHelperStateClassic(DebuggingHelperState);
     void tryLoadDebuggingHelpersClassic();
     void tryQueryDebuggingHelpersClassic();
-    Q_SLOT void recheckDebuggingHelperAvailabilityClassic();
     Q_SLOT void setDebugDebuggingHelpersClassic(const QVariant &on);
     Q_SLOT void setUseDebuggingHelpers(const QVariant &on);