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

ProjectExplorer: Upstream CMake's handling of outdated builds

Browse Source 
This is mainly there to make the local runconfiguration implementations
more uniform. Both qmake and qbs will drop runconfigs for builds that
are not available anymore, so that's a no-op for them.

Change-Id: I8aa32d779f67cce7a4d4733cfbe0c9a136bfd3f7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-02-22 12:16:56 +01:00
parent 4a1a008bab
commit 8536504caa
5 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -214,6 +214,8 @@ bool RunConfiguration::isActive() const
QString RunConfiguration::disabledReason() const
{
if (!target()->hasBuildTarget(m_buildKey))
return tr("The project no longer builds the target associated with this run configuration.");
if (target()->project()->isParsing())
return tr("The Project is currently being parsed.");
if (!target()->project()->hasParsingData())
@@ -243,9 +245,14 @@ QWidget *RunConfiguration::createConfigurationWidget()
void RunConfiguration::updateEnabledState()
{
Project *p = target()->project();
setEnabled(!p->isParsing() && p->hasParsingData());
if (!target()->hasBuildTarget(m_buildKey)) {
// This apparently may happen for cmake builds where also outdated
// RunConfigurations are kept when builds change.
setEnabled(false); // Might happen for CMake.
} else {
Project *p = target()->project();
setEnabled(!p->isParsing() && p->hasParsingData());
}
}
void RunConfiguration::addAspectFactory(const AspectFactory &aspectFactory)