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

QbsProjectManager: Fix build config comparison.

Browse Source 
The current code compares a flat map against the tree-ified version,
which will never be equal.

Change-Id: I99d82d87635e5ccacc5a5709bced9a30f62d4018
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Christian Kandeler
2013-10-24 15:08:39 +02:00
parent 0f094e3251
commit 9aea8087a1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -427,7 +427,7 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
const qbs::Project &currentProject = qbsProject(); const qbs::Project &currentProject = qbsProject();
if (!m_forceParsing if (!m_forceParsing
&& currentProject.isValid() && currentProject.isValid()
&& currentProject.projectConfiguration() == params.buildConfiguration()) { && currentProject.projectConfiguration() == params.finalBuildConfigurationTree()) {
QHash<QString, QString> usedEnv = currentProject.usedEnvironment(); QHash<QString, QString> usedEnv = currentProject.usedEnvironment();
bool canSkip = true; bool canSkip = true;
for (QHash<QString, QString>::const_iterator i = usedEnv.constBegin(); for (QHash<QString, QString>::const_iterator i = usedEnv.constBegin();