qmake: Fix incorrect Info.plist replacement of EXECUTABLE_NAME
The app_bundle_name should be used if it's not empty. Previously it was only used if it was empty. Amends 0749ba2c5eacc4822cf9c7a31edf8d70c4ef6064 Pick-to: 6.5 Fixes: QTBUG-112668 Change-Id: I4a0e8286eabb5156ad62b448afdf7f54cc78a915 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
This commit is contained in:
parent
b2e586cf15
commit
f00280337b
@ -813,7 +813,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
|
||||
<< "-e \"s,\\$${ASSETCATALOG_COMPILER_APPICON_NAME}," << iconName << ",g\" "
|
||||
<< "-e \"s,@EXECUTABLE@," << app_bundle_name << ",g\" "
|
||||
<< "-e \"s,@LIBRARY@," << plugin_bundle_name << ",g\" "
|
||||
<< "-e \"s,\\$${EXECUTABLE_NAME}," << (app_bundle_name.isEmpty() ? app_bundle_name : plugin_bundle_name) << ",g\" "
|
||||
<< "-e \"s,\\$${EXECUTABLE_NAME}," << (!app_bundle_name.isEmpty() ? app_bundle_name : plugin_bundle_name) << ",g\" "
|
||||
<< "-e \"s,@TYPEINFO@,"<< typeInfo << ",g\" "
|
||||
<< "-e \"s,\\$${QMAKE_PKGINFO_TYPEINFO},"<< typeInfo << ",g\" "
|
||||
<< ">" << info_plist_out << Qt::endl;
|
||||
|
Loading…
x
Reference in New Issue
Block a user