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:
@@ -156,7 +156,7 @@ bool AutotoolsProject::fromMap(const QVariantMap &map)
|
||||
this, SLOT(onFileChanged(QString)));
|
||||
|
||||
// Load the project tree structure.
|
||||
evaluateBuildSystem();
|
||||
loadProjectTree();
|
||||
|
||||
Profile *defaultProfile = ProfileManager::instance()->defaultProfile();
|
||||
if (!activeTarget() && defaultProfile)
|
||||
@@ -165,7 +165,7 @@ bool AutotoolsProject::fromMap(const QVariantMap &map)
|
||||
return true;
|
||||
}
|
||||
|
||||
void AutotoolsProject::evaluateBuildSystem()
|
||||
void AutotoolsProject::loadProjectTree()
|
||||
{
|
||||
if (m_makefileParserThread != 0) {
|
||||
// The thread is still busy parsing a previus configuration.
|
||||
@@ -257,14 +257,12 @@ void AutotoolsProject::makefileParsingFinished()
|
||||
|
||||
m_makefileParserThread->deleteLater();
|
||||
m_makefileParserThread = 0;
|
||||
|
||||
buildSystemEvaluationFinished(true);
|
||||
}
|
||||
|
||||
void AutotoolsProject::onFileChanged(const QString &file)
|
||||
{
|
||||
Q_UNUSED(file);
|
||||
evaluateBuildSystem();
|
||||
loadProjectTree();
|
||||
}
|
||||
|
||||
QStringList AutotoolsProject::buildTargets() const
|
||||
|
Reference in New Issue
Block a user