aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-06-24 13:41:10 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-06-24 16:39:53 +0200
commit1d341e09b860220c4dff116a4674a993424758b2 (patch)
tree980b87c800fe686f33d71c5a14cbec1beb15627a /src/lib/corelib/buildgraph
parenta68470880a0195f7a52caad46b442df694cb26b0 (diff)
Be more verbose about changed environment.
If we have to re-resolve because an environment variable changed, print its name as well as the old and new value. Change-Id: I14032da14c151ec31a85f68f1ad56c3b44b3a9d4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph')
-rw-r--r--src/lib/corelib/buildgraph/buildgraphloader.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index 9ff991904..ca186151b 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -315,9 +315,12 @@ bool BuildGraphLoader::hasEnvironmentChanged(const TopLevelProjectConstPtr &rest
{
for (QHash<QString, QString>::ConstIterator it = restoredProject->usedEnvironment.constBegin();
it != restoredProject->usedEnvironment.constEnd(); ++it) {
- if (m_environment.value(it.key()) != it.value()) {
- m_logger.qbsDebug() << "A relevant environment variable changed, "
- "must re-resolve project.";
+ const QString var = it.key();
+ const QString oldValue = it.value();
+ const QString newValue = m_environment.value(var);
+ if (newValue != oldValue) {
+ m_logger.qbsDebug() << QString::fromLatin1("Environment variable '%1' changed "
+ "from '%2' to '%3'. Must re-resolve project.").arg(var, oldValue, newValue);
return true;
}
}