diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2014-02-18 10:02:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-19 21:44:15 +0100 |
| commit | 42789d04a3078652594b8e06f520d7dd5e8021c5 (patch) | |
| tree | 61ce9029f5458b205b4b24ba0aefd4c4a7233abd /qmake/generators | |
| parent | d0784ae43bafbb577ce1d30dcd3327e9271ead2f (diff) | |
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 <oswald.buddenhagen@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 8959305238..6e08c138ed 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" |