diff options
| author | Kai Koehne <[email protected]> | 2012-01-25 10:38:13 +0100 |
|---|---|---|
| committer | hjk <[email protected]> | 2012-01-25 19:47:30 +0100 |
| commit | 8c10d607c07ff908ce9484c41ac9f29f03a4bb60 (patch) | |
| tree | 1a463e73087fc98830645774a7c4abdbece3a08e /src/plugins/debugger/debuggerrunner.cpp | |
| parent | 21c0cdee40757ed7cc9f9e31e3d1e3a3238b6691 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/plugins/debugger/debuggerrunner.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerrunner.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 { |