diff options
| author | hjk <hjk@qt.io> | 2019-03-04 11:51:14 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-03-04 13:12:02 +0000 |
| commit | 014789d994b9ff53fc8fabffedccb44ad4f299b0 (patch) | |
| tree | 5d3b85f298207838d017a9f254604442b8a43958 /src/plugins/qmlprojectmanager | |
| parent | d0db212575909ca18244bdfc99b952dffcd0e902 (diff) | |
QmlProjectManager: Fix QmlProjectRunConfiguration::updateEnabledState
Amends 8536504caa21.
Change-Id: I20d26dd326dc50609f25de1f04f99a5f1ec186a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qmlprojectmanager')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index c11b9597a0a..aefeb97719e 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -375,16 +375,12 @@ QString QmlProjectRunConfiguration::commandLineArguments() const void QmlProjectRunConfiguration::updateEnabledState() { - bool qmlFileFound = m_mainQmlFileAspect->isQmlFilePresent(); - if (!qmlFileFound) { - setEnabled(false); - } else { - const QString exe = executable(); - if (exe.isEmpty()) - setEnabled(false); - else - RunConfiguration::updateEnabledState(); + bool enabled = false; + if (m_mainQmlFileAspect->isQmlFilePresent() && !executable().isEmpty()) { + Project *p = target()->project(); + enabled = !p->isParsing() && p->hasParsingData(); } + setEnabled(enabled); } bool MainQmlFileAspect::isQmlFilePresent() |