diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-11 18:01:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-11 18:10:41 +0100 |
| commit | f4d8cafc1b034f544ca84b849c23ab99bc1600e7 (patch) | |
| tree | f1150b5aeaec4753f2ddfcd17643666b3a82dd9d /mkspecs/macx-g++ | |
| parent | e5b422382a512a8267a0eb24e6543a8cf84478d9 (diff) | |
| parent | b03133231b99922a72831c4ec23faf55516ef404 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/3rdparty/harfbuzz-ng/src/hb-private.hh
src/sql/doc/snippets/code/doc_src_sql-driver.cpp
src/sql/doc/src/sql-driver.qdoc
Change-Id: I38f0e82fcd37926cbf3c1915e009a731040d4598
Diffstat (limited to 'mkspecs/macx-g++')
| -rw-r--r-- | mkspecs/macx-g++/Info.plist.app | 10 | ||||
| -rw-r--r-- | mkspecs/macx-g++/Info.plist.lib | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/mkspecs/macx-g++/Info.plist.app b/mkspecs/macx-g++/Info.plist.app index ebd108dadf..4d64a77704 100644 --- a/mkspecs/macx-g++/Info.plist.app +++ b/mkspecs/macx-g++/Info.plist.app @@ -3,17 +3,19 @@ <plist version="1.0"> <dict> <key>CFBundleExecutable</key> - <string>@EXECUTABLE@</string> + <string>${EXECUTABLE_NAME}</string> <key>CFBundleGetInfoString</key> <string>Created by Qt/QMake</string> <key>CFBundleIconFile</key> - <string>@ICON@</string> + <string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string> <key>CFBundleIdentifier</key> - <string>@BUNDLEIDENTIFIER@</string> + <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> - <string>@TYPEINFO@</string> + <string>${QMAKE_PKGINFO_TYPEINFO}</string> + <key>LSMinimumSystemVersion</key> + <string>${MACOSX_DEPLOYMENT_TARGET}</string> <key>NOTE</key> <string>This file was generated by Qt/QMake.</string> <key>NSPrincipalClass</key> diff --git a/mkspecs/macx-g++/Info.plist.lib b/mkspecs/macx-g++/Info.plist.lib index 044cbd3393..ce28365500 100644 --- a/mkspecs/macx-g++/Info.plist.lib +++ b/mkspecs/macx-g++/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> |