diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-03-18 16:55:20 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2014-03-31 17:16:43 +0200 |
| commit | 76afffe43a14f1cde3742f901f21459835380437 (patch) | |
| tree | a2e1e27d2f37f39a687d51fde2e94f31b8cee3fd /src/plugins/qmakeprojectmanager/qmakestep.cpp | |
| parent | 6bd2a473966512b00a8893cef72a530359bbf138 (diff) | |
| download | qt-creator-76afffe43a14f1cde3742f901f21459835380437.tar.gz | |
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: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakestep.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakestep.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index b6e061f4ce..cd547885e8 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -44,6 +44,7 @@ #include <projectexplorer/toolchain.h> #include <coreplugin/icore.h> +#include <coreplugin/icontext.h> #include <qtsupport/debugginghelperbuildtask.h> #include <qtsupport/qtkitinformation.h> #include <qtsupport/qtversionmanager.h> @@ -367,6 +368,10 @@ bool QMakeStep::linkQmlDebuggingLibrary() const return true; if (m_linkQmlDebuggingLibrary == DoNotLink) return false; + + const Core::Context languages = project()->projectLanguages(); + if (!languages.contains(ProjectExplorer::Constants::LANG_QMLJS)) + return false; return (qmakeBuildConfiguration()->buildType() & BuildConfiguration::Debug); } |