From 42789d04a3078652594b8e06f520d7dd5e8021c5 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Tue, 18 Feb 2014 10:02:26 +0100 Subject: [PATCH] Use QMAKE_TARGET_BUNDLE_PREFIX to build bundle identifier Currently the bundle identifier is build using com.yourcompany + QMAKE_BUNDLE. This patch adds the handling of QMAKE_TARGET_BUNDLE_PREFIX to build the bundle prefix. Task-number: QTBUG-19006 Change-Id: I014279da6dbef393b0df36f6d4995e40ab105316 Reviewed-by: Oswald Buddenhagen Reviewed-by: Liang Qi Reviewed-by: Gabriel de Dietrich --- qmake/generators/unix/unixmake2.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 89593052381..6e08c138edb 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -729,7 +729,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) QString::fromLatin1("????") : project->first("QMAKE_PKGINFO_TYPEINFO").left(4)) << ",g\" "; if(project->first("TEMPLATE") == "app") { QString icon = fileFixify(var("ICON")); - QString bundleIdentifier = "com.yourcompany." + var("QMAKE_BUNDLE"); + QString bundlePrefix = project->first("QMAKE_TARGET_BUNDLE_PREFIX").toQString(); + if (bundlePrefix.isEmpty()) + bundlePrefix = "com.yourcompany."; + QString bundleIdentifier = bundlePrefix + var("QMAKE_BUNDLE"); if (bundleIdentifier.endsWith(".app")) bundleIdentifier.chop(4); t << "@$(DEL_FILE) " << info_plist_out << "\n\t"