From a59f209bb30d68f50d5861c69aae37a77b02b4bb Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 29 Mar 2017 13:15:11 +0200 Subject: [PATCH] QmakePM: Fix executableFor() on macOS Ensure that target is not empty and avoid storing a path instead of the real executable. Change-Id: I408a54befbbb7004773d04f4bdd3898469efbaa7 Reviewed-by: Eike Ziller --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 2aff80e3f1a..d2ce349211f 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -1312,9 +1312,9 @@ QString QmakeProject::executableFor(const QmakeProFile *file) TargetInformation ti = file->targetInformation(); QString target; - if (tc->targetAbi().os() == Abi::DarwinOS) { - if (file->variableValue(Variable::Config).contains(QLatin1String("app_bundle"))) - target = ti.target + QLatin1String(".app/Contents/MacOS/") + ti.target; + if (tc->targetAbi().os() == Abi::DarwinOS + && file->variableValue(Variable::Config).contains("app_bundle")) { + target = ti.target + ".app/Contents/MacOS/" + ti.target; } else { QString extension = file->singleVariableValue(Variable::TargetExt); target = ti.target + extension;