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

Qmake: Do not repeat build directory in warning message

Browse Source 
The build directory line edit is right above the label containing the
message, so repeating the build dir value just widens the label
unnesessarily.

Change-Id: I650a4ce76a82582b2710a4673c134dbb4faf306e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-02-20 15:33:26 +01:00
committed by hjk
parent 87d2df9d7b
commit daa58e899d
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -319,16 +319,13 @@ void QmakeBuildConfiguration::updateProblemLabel()
return; return;
} }
} else if (targetMismatch) { } else if (targetMismatch) {
buildDirectoryAspect()->setProblem(tr("A build for a different project exists in %1, " buildDirectoryAspect()->setProblem(tr("The build directory contains a build for "
"which will be overwritten.", "a different project, which will be overwritten."));
"%1 build directory")
.arg(buildDirectory().toUserOutput()));
return; return;
} else if (incompatibleBuild) { } else if (incompatibleBuild) {
buildDirectoryAspect()->setProblem(tr("%1 The build in %2 will be overwritten.", buildDirectoryAspect()->setProblem(tr("%1 The build will be overwritten.",
"%1 error message, %2 build directory") "%1 error message")
.arg(errorString) .arg(errorString));
.arg(buildDirectory().toUserOutput()));
return; return;
} else if (unalignedBuildDir) { } else if (unalignedBuildDir) {
buildDirectoryAspect()->setProblem(unalignedBuildDirWarning()); buildDirectoryAspect()->setProblem(unalignedBuildDirWarning());