Commit a59f209b authored by Christian Stenger's avatar Christian Stenger
Browse files

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's avatarEike Ziller <eike.ziller@qt.io>
parent 0683281b
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment