From 03492f24da8bc063b4a294012950365a3be6f778 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Wed, 8 Sep 2010 14:25:33 +0200
Subject: [PATCH] QML debugging: Adaptations for Maemo.
Reviewed-by: Lasse Holmstedt
---
src/plugins/debugger/debuggerrunner.cpp | 1 +
src/plugins/debugger/qml/qmlcppengine.h | 4 +++-
src/plugins/debugger/qml/qmlengine.cpp | 4 +++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 0f80b683dbe..e8d3dfc909d 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 68b2558ab04..d33e010528f 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 7e0207bcd81..2cd0f9b6395 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();
}
--
GitLab