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

15
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -136,14 +136,14 @@ void Qt4BuildConfiguration::ctor()
connect(this, SIGNAL(environmentChanged()),
this, SLOT(emitBuildDirectoryChanged()));
connect(this, SIGNAL(environmentChanged()),
this, SLOT(emitEvaluateBuildSystem()));
this, SLOT(emitProFileEvaluateNeeded()));
connect(target(), SIGNAL(profileChanged()),
this, SLOT(profileChanged()));
}
void Qt4BuildConfiguration::profileChanged()
{
emit requestBuildSystemEvaluation();
emitProFileEvaluateNeeded();
emit environmentChanged();
emitBuildDirectoryChanged();
}
@@ -265,7 +265,7 @@ void Qt4BuildConfiguration::setShadowBuildAndDirectory(bool shadowBuild, const Q
emit environmentChanged();
emitBuildDirectoryChanged();
emitEvaluateBuildSystem();
emitProFileEvaluateNeeded();
}
QString Qt4BuildConfiguration::defaultMakeTarget() const
@@ -294,14 +294,17 @@ void Qt4BuildConfiguration::setQMakeBuildConfiguration(QtSupport::BaseQtVersion:
return;
m_qmakeBuildConfiguration = config;
emitEvaluateBuildSystem();
emit qmakeBuildConfigurationChanged();
emitBuildDirectoryChanged();
emitProFileEvaluateNeeded();
}
void Qt4BuildConfiguration::emitEvaluateBuildSystem()
void Qt4BuildConfiguration::emitProFileEvaluateNeeded()
{
emit requestBuildSystemEvaluation();
Target *t = target();
Project *p = t->project();
if (t->activeBuildConfiguration() == this && p->activeTarget() == t)
static_cast<Qt4Project *>(p)->scheduleAsyncUpdate();
}
void Qt4BuildConfiguration::emitQMakeBuildConfigurationChanged()