From 014789d994b9ff53fc8fabffedccb44ad4f299b0 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 4 Mar 2019 11:51:14 +0100 Subject: [PATCH] QmlProjectManager: Fix QmlProjectRunConfiguration::updateEnabledState Amends 8536504caa21. Change-Id: I20d26dd326dc50609f25de1f04f99a5f1ec186a6 Reviewed-by: Christian Kandeler --- .../qmlprojectrunconfiguration.cpp | 14 +++++--------- 1 file 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()