Commit 8c10d607 authored by Kai Koehne's avatar Kai Koehne Committed by hjk
Browse files

Debugger: Fix 'Attach to Qml port'



Never use the combined QmlCppEngine if the primary engine is already
the QmlEngine.

Change-Id: Ic87816bbe67fdf4ab004a41db601e33383c570dc
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 21c0cdee
...@@ -644,7 +644,8 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa ...@@ -644,7 +644,8 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa
// Anything left: Happy. // Anything left: Happy.
result.errorMessage.clear(); result.errorMessage.clear();
result.errorDetails.clear(); result.errorDetails.clear();
if (qmlLanguage && cppLanguage) { if (qmlLanguage && cppLanguage
&& usableType != QmlEngineType) {
result.masterSlaveEngineTypes.first = QmlCppEngineType; result.masterSlaveEngineTypes.first = QmlCppEngineType;
result.masterSlaveEngineTypes.second = usableType; result.masterSlaveEngineTypes.second = usableType;
} else { } else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment