diff options
author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2019-06-27 15:38:25 +0300 |
---|---|---|
committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2019-08-15 10:01:55 +0000 |
commit | d4eb7fba672b37113c9f4eb8e440b9cb879b1d5a (patch) | |
tree | 767912eaea0b230bb49d6737fdfb7bdbaf332171 | |
parent | 1c22f5dd467511d0abfaea1209f67d49ee8ec92f (diff) |
Fix IFW version information not apparent on macOS
On macOS remove the use of obsolete CFBundleGetInfoString, replace with
CFBundleVersion and CFBundleShortVersionString respectively so that the
bundle's properties in Info.plist are up to date and version shows
correctly.
Task-number: QTIFW-1396
Change-Id: Iac03478e266d9d2994ecdf3b229e63976d683ac0
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
-rw-r--r-- | tools/binarycreator/binarycreator.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index 5de4ff745..257fc22fe 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -330,9 +330,12 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt << endl; plistStream << QLatin1String("\t<key>CFBundlePackageType</key>") << endl; plistStream << QLatin1String("\t<string>APPL</string>") << endl; - plistStream << QLatin1String("\t<key>CFBundleGetInfoString</key>") << endl; #define QUOTE_(x) #x #define QUOTE(x) QUOTE_(x) + plistStream << QLatin1String("\t<key>CFBundleShortVersionString</key>") << endl; + plistStream << QLatin1String("\t<string>") << QLatin1String(QUOTE(IFW_VERSION_STR)) << ("</string>") + << endl; + plistStream << QLatin1String("\t<key>CFBundleVersion</key>") << endl; plistStream << QLatin1String("\t<string>") << QLatin1String(QUOTE(IFW_VERSION_STR)) << ("</string>") << endl; #undef QUOTE |