diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-11-20 23:49:34 -0800 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2018-01-06 19:46:00 +0000 |
commit | 0749ba2c5eacc4822cf9c7a31edf8d70c4ef6064 (patch) | |
tree | 623467618278ab61ca74bbacdc22b9cc1eca1143 /mkspecs/macx-tvos-clang | |
parent | b739b3a0402e71041d99fa138630b806059b19b2 (diff) |
Rewrite the Info.plist variable replacement handling
This ensures that the same set of variables can be successfully replaced
in both the Makefile and Xcode generators. It also switches the default
templates to use the Xcode-style ${var} syntax instead of the @var@
syntax for better Info.plist compatibility across generators.
Change-Id: Iff330bafd152773aafac9143c4a34e34f92f0ce6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/macx-tvos-clang')
-rw-r--r-- | mkspecs/macx-tvos-clang/Info.plist.app | 12 | ||||
-rw-r--r-- | mkspecs/macx-tvos-clang/Info.plist.lib | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mkspecs/macx-tvos-clang/Info.plist.app b/mkspecs/macx-tvos-clang/Info.plist.app index a034826207..04aef816c2 100644 --- a/mkspecs/macx-tvos-clang/Info.plist.app +++ b/mkspecs/macx-tvos-clang/Info.plist.app @@ -7,7 +7,7 @@ <key>CFBundleDisplayName</key> <string>${PRODUCT_NAME}</string> <key>CFBundleExecutable</key> - <string>@EXECUTABLE@</string> + <string>${EXECUTABLE_NAME}</string> <key>CFBundleGetInfoString</key> <string>Created by Qt/QMake</string> <key>CFBundleIcons</key> @@ -16,25 +16,25 @@ <string>App Icon - Small</string> </dict> <key>CFBundleIdentifier</key> - <string>@BUNDLEIDENTIFIER@</string> + <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> <key>CFBundleName</key> <string>${PRODUCT_NAME}</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.0</string> + <string>${QMAKE_SHORT_VERSION}</string> <key>CFBundleSignature</key> - <string>@TYPEINFO@</string> + <string>${QMAKE_PKGINFO_TYPEINFO}</string> <key>CFBundleSupportedPlatforms</key> <array> <string>AppleTVOS</string> </array> <key>CFBundleVersion</key> - <string>1.0</string> + <string>${QMAKE_FULL_VERSION}</string> <key>LSRequiresIPhoneOS</key> <true/> <key>MinimumOSVersion</key> - <string>9.1</string> + <string>${TVOS_DEPLOYMENT_TARGET}</string> <key>NOTE</key> <string>This file was generated by Qt/QMake.</string> </dict> diff --git a/mkspecs/macx-tvos-clang/Info.plist.lib b/mkspecs/macx-tvos-clang/Info.plist.lib index 044cbd3393..ce28365500 100644 --- a/mkspecs/macx-tvos-clang/Info.plist.lib +++ b/mkspecs/macx-tvos-clang/Info.plist.lib @@ -3,19 +3,19 @@ <plist version="1.0"> <dict> <key>CFBundleExecutable</key> - <string>@LIBRARY@</string> + <string>${EXECUTABLE_NAME}</string> <key>CFBundleGetInfoString</key> <string>Created by Qt/QMake</string> <key>CFBundleIdentifier</key> - <string>@BUNDLEIDENTIFIER@</string> + <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleShortVersionString</key> - <string>@SHORT_VERSION@</string> + <string>${QMAKE_SHORT_VERSION}</string> <key>CFBundleSignature</key> - <string>@TYPEINFO@</string> + <string>${QMAKE_PKGINFO_TYPEINFO}</string> <key>CFBundleVersion</key> - <string>@FULL_VERSION@</string> + <string>${QMAKE_FULL_VERSION}</string> <key>NOTE</key> <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string> </dict> |