diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-12-11 10:43:47 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-12-11 12:28:21 +0000 |
| commit | 4e6d2a201f725a21fe3207419ba9b90263ebe704 (patch) | |
| tree | 08a3609e715306159ccfde19d106dd537bf7747c | |
| parent | 48270d58a6170f81a6c8d79a42f5a2b6cb0942e5 (diff) | |
| download | qt-creator-4e6d2a201f725a21fe3207419ba9b90263ebe704.tar.gz | |
Debugger: Don't auto-enable QML debugging if LANG_QMLJS isn't set
Change-Id: Id2734ed9615e6c4035d2eacb5bf57dbb2d5029e4
Task-number: QTCREATORBUG-15490
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
| -rw-r--r-- | src/plugins/debugger/debuggerrunconfigurationaspect.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp index 5c8713e473..d630eb9004 100644 --- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp +++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp @@ -253,6 +253,10 @@ bool DebuggerRunConfigurationAspect::useCppDebugger() const bool DebuggerRunConfigurationAspect::useQmlDebugger() const { if (m_useQmlDebugger == DebuggerRunConfigurationAspect::AutoEnabledLanguage) { + const Core::Context languages = runConfiguration()->target()->project()->projectLanguages(); + if (!languages.contains(ProjectExplorer::Constants::LANG_QMLJS)) + return false; + // // Try to find a build step (qmake) to check whether qml debugging is enabled there // (Using the Qt metatype system to avoid a hard qt4projectmanager dependency) @@ -267,9 +271,7 @@ bool DebuggerRunConfigurationAspect::useQmlDebugger() const } } - const Core::Context languages = runConfiguration()->target()->project()->projectLanguages(); - return languages.contains(ProjectExplorer::Constants::LANG_QMLJS) - && !languages.contains(ProjectExplorer::Constants::LANG_CXX); + return !languages.contains(ProjectExplorer::Constants::LANG_CXX); } return m_useQmlDebugger == DebuggerRunConfigurationAspect::EnabledLanguage; } |