diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-22 15:44:43 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-09-23 16:59:06 +0200 |
| commit | 5c1ed8bb74ee4eed9ffc9537b880104445b43cd7 (patch) | |
| tree | 908c536822c43134177c5c62c10e98e2036ec69a /mkspecs | |
| parent | be2635b8dd37dfa7cb3f1c41544b2736d13a058d (diff) | |
Use 'A' for Apple framework version instead of Qt major version
All system frameworks use 'A' instead of the major version of the
framework, and Xcode's code signing assumes that the framework version
is 'A' when signing embedded frameworks (FB7323980), so leave the
version 'A'. This is also what Apple recommends.
Change-Id: Idbf2e30e156c3e869da8f75731e568524d9407e5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/resolve_target.prf | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 828a9621b9..d8c154e920 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -128,7 +128,7 @@ else: \ lib_bundle { # Set the CFBundleIdentifier prefix for Qt frameworks QMAKE_TARGET_BUNDLE_PREFIX = org.qt-project - #QMAKE_FRAMEWORK_VERSION = 4.0 + QMAKE_FRAMEWORK_VERSION = "A" # Not based on Qt major version CONFIG += sliced_bundle header_module { CONFIG += bundle diff --git a/mkspecs/features/resolve_target.prf b/mkspecs/features/resolve_target.prf index 1ef1dcfd1c..73a8a61a9c 100644 --- a/mkspecs/features/resolve_target.prf +++ b/mkspecs/features/resolve_target.prf @@ -56,9 +56,10 @@ win32 { framework_ext = $$QMAKE_BUNDLE_EXTENSION QMAKE_RESOLVED_BUNDLE = $${QMAKE_RESOLVED_TARGET}$${framework_target}$${framework_ext} !shallow_bundle { - TEMP_VERSION = $$section(VERSION, ., 0, 0) - isEmpty(TEMP_VERSION):TEMP_VERSION = A - QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_BUNDLE}/Versions/$${TEMP_VERSION}/$${TARGET} + framework_version = $$QMAKE_FRAMEWORK_VERSION + isEmpty(framework_version):framework_version = $$section(VERSION, ., 0, 0) + isEmpty(framework_version):framework_version = A + QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_BUNDLE}/Versions/$${framework_version}/$${TARGET} } else { QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_BUNDLE}/$${TARGET} } |