summaryrefslogtreecommitdiff
path: root/src/lib/buildgraph/buildgraphloader.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-10-11 15:14:44 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-10-11 15:46:04 +0200
commitdec146df450919ff720a3afa5704db21d36e9c95 (patch)
treedca72a867e4796d0c76e17ba259a7f563d0990f6 /src/lib/buildgraph/buildgraphloader.cpp
parent1135d797faea2df5eb426f2d45c9e899fd1f30cb (diff)
downloadqbs-dec146df450919ff720a3afa5704db21d36e9c95.tar.gz
Tell users which build graph we are talking about...
... when complaining about a project file mismatch. Task-number: QBS-382 Change-Id: I25ad56acace014fb03bb7eb55433823ba14d8978 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/buildgraph/buildgraphloader.cpp')
-rw-r--r--src/lib/buildgraph/buildgraphloader.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/buildgraph/buildgraphloader.cpp b/src/lib/buildgraph/buildgraphloader.cpp
index c2cf8b58a..861738477 100644
--- a/src/lib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/buildgraph/buildgraphloader.cpp
@@ -126,9 +126,10 @@ BuildGraphLoadResult BuildGraphLoader::load(const SetupProjectParameters &parame
project->buildData->evaluationContext = evalContext;
if (QFileInfo(project->location.fileName()) != QFileInfo(parameters.projectFilePath())) {
- QString errorMessage = Tr::tr("Stored build graph is for project file '%1', but "
- "input file is '%2'. ")
- .arg(QDir::toNativeSeparators(project->location.fileName()),
+ QString errorMessage = Tr::tr("Stored build graph at '%1' is for project file '%2', but "
+ "input file is '%3'. ")
+ .arg(QDir::toNativeSeparators(buildGraphFilePath),
+ QDir::toNativeSeparators(project->location.fileName()),
QDir::toNativeSeparators(parameters.projectFilePath()));
if (!parameters.ignoreDifferentProjectFilePath()) {
errorMessage += Tr::tr("Aborting.");