forked from qt-creator/qt-creator
Remove evaluateBuildSystem signal
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:
@@ -162,8 +162,6 @@ void Project::addTarget(Target *t)
|
||||
SLOT(changeEnvironment()));
|
||||
connect(t, SIGNAL(buildConfigurationEnabledChanged()),
|
||||
this, SLOT(changeBuildConfigurationEnabled()));
|
||||
connect(t, SIGNAL(requestBuildSystemEvaluation()),
|
||||
this, SLOT(triggerBuildSystemEvaluation()));
|
||||
connect(t, SIGNAL(buildDirectoryChanged()),
|
||||
this, SLOT(onBuildDirectoryChanged()));
|
||||
emit addedTarget(t);
|
||||
@@ -399,9 +397,6 @@ void Project::setProjectLanguage(Core::Context language)
|
||||
d->m_projectLanguage = language;
|
||||
}
|
||||
|
||||
void Project::evaluateBuildSystem()
|
||||
{ buildSystemEvaluationFinished(true); }
|
||||
|
||||
Core::Context Project::projectContext() const
|
||||
{
|
||||
return d->m_projectContext;
|
||||
@@ -435,27 +430,6 @@ void Project::configureAsExampleProject(const QStringList &platforms)
|
||||
Q_UNUSED(platforms);
|
||||
}
|
||||
|
||||
void Project::triggerBuildSystemEvaluation()
|
||||
{
|
||||
Target *target = qobject_cast<Target *>(sender());
|
||||
if (target && target != activeTarget())
|
||||
return;
|
||||
|
||||
evaluateBuildSystem();
|
||||
}
|
||||
|
||||
void Project::buildSystemEvaluationFinished(bool success)
|
||||
{
|
||||
if (!success)
|
||||
return;
|
||||
|
||||
// Create new run configurations:
|
||||
foreach (Target *t, targets())
|
||||
t->updateDefaultRunConfigurations();
|
||||
|
||||
emit buildSystemEvaluated();
|
||||
}
|
||||
|
||||
void Project::onBuildDirectoryChanged()
|
||||
{
|
||||
Target *target = qobject_cast<Target *>(sender());
|
||||
|
||||
Reference in New Issue
Block a user