Commit 76afffe4 authored by Kai Koehne's avatar Kai Koehne
Browse files

Enable QML debugging only if project includes a qml library

Use the same check as in the DebuggerRunConfigurationAspect to
decide whether to  enable qml debugging, or not. This allows
us to follow the qmakestep setting in the run settings in a
follow-up change.

Task-number: QTCREATORBUG-11474
Change-Id: I67900cf719a56c0246e792c6aca66ce8e5d77daf
Reviewed-by: default avatarEike Ziller <>
Reviewed-by: default avatarAlessandro Portale <>
parent 6bd2a473
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/icontext.h>
#include <qtsupport/debugginghelperbuildtask.h> #include <qtsupport/debugginghelperbuildtask.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
...@@ -367,6 +368,10 @@ bool QMakeStep::linkQmlDebuggingLibrary() const ...@@ -367,6 +368,10 @@ bool QMakeStep::linkQmlDebuggingLibrary() const
return true; return true;
if (m_linkQmlDebuggingLibrary == DoNotLink) if (m_linkQmlDebuggingLibrary == DoNotLink)
return false; return false;
const Core::Context languages = project()->projectLanguages();
if (!languages.contains(ProjectExplorer::Constants::LANG_QMLJS))
return false;
return (qmakeBuildConfiguration()->buildType() & BuildConfiguration::Debug); return (qmakeBuildConfiguration()->buildType() & BuildConfiguration::Debug);
} }
Supports Markdown
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