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

Remove evaluateBuildSystem signal

Browse Source 
It adds almost nothing and introduced some bugs.
This fixes:
Double evaluation in cmakeproject on build directory changes.
Wrong runconfiguration update in cmake for set_target_properties(target
PROPERTIES OUTPUT_NAME [..]) changes.

Unecessary runconfiguration removal in AutoTools and Generic projectmanager.

Reevaluation of .pro files on changing the active runconfiguration or deploy
configuration.

Task-number: QTCREATORBUG-7723
Task-number: QTCREATORBUG-7761

Change-Id: I50249b186917cd3a4f399f187f09ac8428ab6f9e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Daniel Teske
2012-07-17 15:56:43 +02:00
parent 8d8ab020b1
commit 36f6c02f1c
20 changed files with 154 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/projectexplorer/target.cpp
View File

@@ -236,9 +236,6 @@ void Target::addBuildConfiguration(BuildConfiguration *configuration)
SLOT(changeEnvironment()));
connect(configuration, SIGNAL(enabledChanged()),
this, SLOT(changeBuildConfigurationEnabled()));
connect(configuration, SIGNAL(requestBuildSystemEvaluation()),
this, SLOT(onRequestBuildSystemEvaluation()));
if (!activeBuildConfiguration())
setActiveBuildConfiguration(configuration);
@@ -290,7 +287,6 @@ void Target::setActiveBuildConfiguration(BuildConfiguration *configuration)
emit environmentChanged();
emit buildConfigurationEnabledChanged();
emit buildDirectoryChanged();
emit requestBuildSystemEvaluation();
}
}
@@ -314,7 +310,6 @@ void Target::addDeployConfiguration(DeployConfiguration *dc)
d->m_deployConfigurations.push_back(dc);
connect(dc, SIGNAL(enabledChanged()), this, SLOT(changeDeployConfigurationEnabled()));
connect(dc, SIGNAL(requestBuildSystemEvaluation()), this, SLOT(onRequestBuildSystemEvaluation()));
emit addedDeployConfiguration(dc);
@@ -367,7 +362,6 @@ void Target::setActiveDeployConfiguration(DeployConfiguration *dc)
d->m_activeDeployConfiguration = dc;
emit activeDeployConfigurationChanged(d->m_activeDeployConfiguration);
emit deployConfigurationEnabledChanged();
emit requestBuildSystemEvaluation();
}
updateDeviceState();
}
@@ -450,7 +444,6 @@ void Target::setActiveRunConfiguration(RunConfiguration* configuration)
d->m_activeRunConfiguration = configuration;
emit activeRunConfigurationChanged(d->m_activeRunConfiguration);
emit runConfigurationEnabledChanged();
emit requestBuildSystemEvaluation();
}
updateDeviceState();
}
@@ -835,14 +828,4 @@ bool Target::fromMap(const QVariantMap &map)
return true;
}
void Target::onRequestBuildSystemEvaluation()
{
ProjectConfiguration *config = qobject_cast<ProjectConfiguration *>(sender());
if (!config)
return;
if (config == static_cast<ProjectConfiguration *>(activeBuildConfiguration())
|| config == static_cast<ProjectConfiguration *>(activeDeployConfiguration()))
emit requestBuildSystemEvaluation();
}
} // namespace ProjectExplorer