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

Qt4: Show correct directory in warnings

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2013-01-21 15:12:43 +01:00
parent 5bfdd92973
commit 47c3037c3d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -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);