aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2013-01-21 15:12:43 +0100
committerTobias Hunger <tobias.hunger@digia.com>2013-01-21 15:31:27 +0100
commit47c3037c3df6be903228ecd5df04cc5f03020972 (patch)
tree4a3c9224666d5935cff84b3a5fde709b27a8971c
parent5bfdd9297375f388bb531c2075ee2057b9f73c00 (diff)
Qt4: Show correct directory in warnings
Show the source directory in warnings about the next build overwriting things if using in-source builds. Task-number: QTCREATORBUG-8585 Change-Id: Ie8b5dc36fdfefa399284f3d90d6901c90dda0033 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
-rw-r--r--src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 8f89331089..7d904e3dde 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -289,12 +289,12 @@ void Qt4ProjectConfigWidget::updateProblemLabel()
} else if (targetMismatch) {
setProblemLabel(shadowBuildWarning + tr("A build for a different project exists in %1, which will be overwritten.",
"%1 build directory")
- .arg(m_ui->shadowBuildDirEdit->path()));
+ .arg(m_buildConfiguration->buildDirectory()));
return;
} else if (incompatibleBuild) {
setProblemLabel(shadowBuildWarning +tr("An incompatible build exists in %1, which will be overwritten.",
"%1 build directory")
- .arg(m_ui->shadowBuildDirEdit->path()));
+ .arg(m_buildConfiguration->buildDirectory()));
return;
} else if (!shadowBuildWarning.isEmpty()) {
setProblemLabel(shadowBuildWarning);