From 74a38b9716e55d9fcbc8fd461cc957669a2f502d Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 20 Feb 2020 15:33:26 +0100 Subject: [PATCH] Qmake: Do not repeat build directory in warning message 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 --- .../qmakeprojectmanager/qmakebuildconfiguration.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index f0eff15cc3f..b44ae9fba31 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -319,16 +319,13 @@ void QmakeBuildConfiguration::updateProblemLabel() return; } } else if (targetMismatch) { - buildDirectoryAspect()->setProblem(tr("A build for a different project exists in %1, " - "which will be overwritten.", - "%1 build directory") - .arg(buildDirectory().toUserOutput())); + buildDirectoryAspect()->setProblem(tr("The build directory contains a build for " + "a different project, which will be overwritten.")); return; } else if (incompatibleBuild) { - buildDirectoryAspect()->setProblem(tr("%1 The build in %2 will be overwritten.", - "%1 error message, %2 build directory") - .arg(errorString) - .arg(buildDirectory().toUserOutput())); + buildDirectoryAspect()->setProblem(tr("%1 The build will be overwritten.", + "%1 error message") + .arg(errorString)); return; } else if (unalignedBuildDir) { buildDirectoryAspect()->setProblem(unalignedBuildDirWarning());