feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProjectManager: Fix QmlProjectRunConfiguration::updateEnabledState

Browse Source 
Amends 8536504caa.

Change-Id: I20d26dd326dc50609f25de1f04f99a5f1ec186a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-03-04 11:51:14 +01:00
parent d0db212575
commit 014789d994
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -375,16 +375,12 @@ QString QmlProjectRunConfiguration::commandLineArguments() const
void QmlProjectRunConfiguration::updateEnabledState() void QmlProjectRunConfiguration::updateEnabledState()
{ {
bool qmlFileFound = m_mainQmlFileAspect->isQmlFilePresent(); bool enabled = false;
if (!qmlFileFound) { if (m_mainQmlFileAspect->isQmlFilePresent() && !executable().isEmpty()) {
setEnabled(false); Project *p = target()->project();
} else { enabled = !p->isParsing() && p->hasParsingData();
const QString exe = executable();
if (exe.isEmpty())
setEnabled(false);
else
RunConfiguration::updateEnabledState();
} }
setEnabled(enabled);
} }
bool MainQmlFileAspect::isQmlFilePresent() bool MainQmlFileAspect::isQmlFilePresent()