Revert "ProjectExplorer: Upstream CMake's handling of outdated builds"

This reverts commit 8536504caa.

Break CustomRunConfigurations.

Change-Id: I43020bd34780cb5fd02bbe640a817370d73cca18
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2019-05-03 16:58:17 +02:00
parent 2ecffca9b0
commit 1de548d1cb
5 changed files with 30 additions and 18 deletions

View File

@@ -211,8 +211,6 @@ void RunConfiguration::setEnabled(bool enabled)
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()) {
@@ -247,14 +245,9 @@ QWidget *RunConfiguration::createConfigurationWidget()
void RunConfiguration::updateEnabledState()
{
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());
}
Project *p = target()->project();
setEnabled(!p->isParsing() && p->hasParsingData());
}
void RunConfiguration::addAspectFactory(const AspectFactory &aspectFactory)