From 8c10d607c07ff908ce9484c41ac9f29f03a4bb60 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 25 Jan 2012 10:38:13 +0100
Subject: [PATCH] Debugger: Fix 'Attach to Qml port'
Never use the combined QmlCppEngine if the primary engine is already
the QmlEngine.
Change-Id: Ic87816bbe67fdf4ab004a41db601e33383c570dc
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/debugger/debuggerrunner.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 8be9f172463..d4bc19966d3 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -644,7 +644,8 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa
// Anything left: Happy.
result.errorMessage.clear();
result.errorDetails.clear();
- if (qmlLanguage && cppLanguage) {
+ if (qmlLanguage && cppLanguage
+ && usableType != QmlEngineType) {
result.masterSlaveEngineTypes.first = QmlCppEngineType;
result.masterSlaveEngineTypes.second = usableType;
} else {
--
GitLab