From: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Date: Mon, 10 Aug 2015 09:41:54 +0000 (+0200)
Subject: Mac: Remove invalid bundle identifier characters
X-Git-Tag: v5.5.90+alpha1~18^2^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4738b450d26b6cdaed6f9f11f0dc22b842c124df;p=platform%2Fupstream%2Fqtbase.git

Mac: Remove invalid bundle identifier characters

Valid characters are (A-Z,a-z,0-9,-,.).

It is unlikely that we will see anything more exotic
than '_' in bundle/library names, go ahead and replace
that character only.

Task-number: QTBUG-46824
Change-Id: Ia97b7cd6247f40a970b4919363ffb66fb347186c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
---

diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 8d841dfd82..e4973157cd 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -840,6 +840,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 bundleIdentifier.chop(4);
             if (bundleIdentifier.endsWith(".framework"))
                 bundleIdentifier.chop(10);
+            // replace invalid bundle id characters
+            bundleIdentifier.replace('_', '-');
             commonSedArgs << "-e \"s,@BUNDLEIDENTIFIER@," << bundleIdentifier << ",g\" ";
 
             if (isApp) {