diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 0f80b683dbe887b4009312e5c5d5d2e6b2096f96..e8d3dfc909d199ded7af72767d8a034fc33227b8 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -260,6 +260,7 @@ static DebuggerEngineType engineForToolChain(int toolChainType)
         case ProjectExplorer::ToolChain::RVCT_ARMV6:
         case ProjectExplorer::ToolChain::RVCT_ARMV5_GNUPOC:
         case ProjectExplorer::ToolChain::GCCE_GNUPOC:
+        case ProjectExplorer::ToolChain::GCC_MAEMO:
             return GdbEngineType;
 
         case ProjectExplorer::ToolChain::MSVC:
diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h
index 68b2558ab045ea6d2ed38c00b118e3672d718b27..d33e010528f70966b0e155edc7d38e6a827508b5 100644
--- a/src/plugins/debugger/qml/qmlcppengine.h
+++ b/src/plugins/debugger/qml/qmlcppengine.h
@@ -13,7 +13,7 @@ namespace Internal {
 class GdbEngine;
 class QmlEngine;
 
-class QmlCppEngine : public DebuggerEngine
+class DEBUGGER_EXPORT QmlCppEngine : public DebuggerEngine
 {
     Q_OBJECT
 public:
@@ -67,6 +67,8 @@ public:
     QAbstractItemModel *returnModel() const;
     QAbstractItemModel *sourceFilesModel() const;
 
+    DebuggerEngine *cppEngine() const { return m_cppEngine; }
+
 protected:
     virtual void detachDebugger();
     virtual void executeStep();
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 7e0207bcd810face68c18ba9260193eed5365822..2cd0f9b639588ef7383d958f0e3821a2a0839693 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -162,7 +162,9 @@ void QmlEngine::connectionStartupFailed()
 {
     QMessageBox::critical(0,
                           tr("Failed to connect to debugger"),
-                          tr("Could not connect to debugger server.") );
+                          tr("Could not connect to QML debugger server at %1:%2.")
+                          .arg(startParameters().qmlServerAddress)
+                          .arg(startParameters().qmlServerPort));
     notifyEngineRunFailed();
 }