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 /cmake | |
| 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 'cmake')
| -rw-r--r-- | cmake/QtFrameworkHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtFrameworkHelpers.cmake b/cmake/QtFrameworkHelpers.cmake index 7a9cb6e75b..64efc439c3 100644 --- a/cmake/QtFrameworkHelpers.cmake +++ b/cmake/QtFrameworkHelpers.cmake @@ -47,7 +47,7 @@ function(qt_internal_find_apple_system_framework out_var framework_name) endif() endfunction() -# Copy header files to QtXYZ.framework/Versions/6/Headers/ +# Copy header files to QtXYZ.framework/Versions/A/Headers/ # Use this function for header files that # - are not added as source files to the target # - are not marked as PUBLIC_HEADER diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 08f7629cf9..2ab91cc954 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -54,7 +54,7 @@ function(qt_internal_add_module target) set(is_framework 1) set_target_properties(${target} PROPERTIES FRAMEWORK TRUE - FRAMEWORK_VERSION ${PROJECT_VERSION_MAJOR} + FRAMEWORK_VERSION "A" # Not based on Qt major version MACOSX_FRAMEWORK_IDENTIFIER org.qt-project.Qt${target} MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} |