diff options
| author | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-08-10 11:41:54 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-08-18 13:34:58 +0000 |
| commit | 4738b450d26b6cdaed6f9f11f0dc22b842c124df (patch) | |
| tree | 131566f569cbba4c1b407c932a50b43fd1376af7 /qmake | |
| parent | f5885f71fd80bd1953c3be5e48dd1ad4fb1af9a1 (diff) | |
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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) { |