diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:30:54 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:30:54 +0300 |
| commit | da6e958319e95fe564d3b30c931492dd666bfaff (patch) | |
| tree | 16ac1556a573daeba5c9c4b795f86aa166ffe467 /mkspecs | |
| parent | 29400a683f96867133b28299c0d0bd6bcf40df35 (diff) | |
| parent | a96fc76fa78f3500266b3a34016f9e1bd29b319c (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: Iac056a5e9f59fc8d1929171c18039aeb45be22b8
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/uikit.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 5 | ||||
| -rwxr-xr-x | mkspecs/features/data/mac/objc_namespace.sh | 6 | ||||
| -rw-r--r-- | mkspecs/features/win32/separate_debug_info.prf | 6 |
4 files changed, 12 insertions, 7 deletions
diff --git a/mkspecs/common/uikit.conf b/mkspecs/common/uikit.conf index 0388b8e616..8419506f09 100644 --- a/mkspecs/common/uikit.conf +++ b/mkspecs/common/uikit.conf @@ -3,7 +3,7 @@ # QMAKE_PLATFORM += uikit -CONFIG += bitcode reduce_exports shallow_bundle no_qt_rpath +CONFIG += reduce_exports shallow_bundle no_qt_rpath INCLUDEPATH += $$PWD/uikit diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 0fc673088b..8437e1542b 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -79,11 +79,12 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { # They will be created for each architecture, since they could be different # we need to account for all of them qmake_qrc_path = "qmake_qmake_immediate.qrc" + base_out_path = $$OUT_PWD/$$RCC_DIR multi_android_abi { for (arch, ANDROID_ABIS): \ - rescopy += $$absolute_path($$qmake_qrc_path, $$OUT_PWD/$$arch) + rescopy += $$absolute_path($$qmake_qrc_path, $$base_out_path/$$arch) } else { - rescopy += $$absolute_path($$qmake_qrc_path, $$OUT_PWD) + rescopy += $$absolute_path($$qmake_qrc_path, $$base_out_path) } } else { contains(resource, ".*\\.qrc$"): rescopy += $$absolute_path($$resource, $$_PRO_FILE_PWD_) diff --git a/mkspecs/features/data/mac/objc_namespace.sh b/mkspecs/features/data/mac/objc_namespace.sh index 16af001fa8..b24c5f071c 100755 --- a/mkspecs/features/data/mac/objc_namespace.sh +++ b/mkspecs/features/data/mac/objc_namespace.sh @@ -116,7 +116,7 @@ read_32bit_value() { otool_args= otool() { - command otool $otool_args $* + command otool $otool_args "$@" } declare -a extra_classnames_files @@ -234,13 +234,13 @@ if [ "${mach_header[0]}" != "MH_MAGIC_64" ]; then exit 1 fi -architectures=$(otool -f -v $target | grep architecture) +architectures=$(otool -f -v "$target" | grep architecture) setup_arch() { arch="$1" if [ ! -z "$arch" ]; then otool_args="-arch $arch" - offset=$(otool -f -v $target | grep -A 6 "architecture $arch" | grep offset) + offset=$(otool -f -v "$target" | grep -A 6 "architecture $arch" | grep offset) offset="${offset##*( )}" arch_offset="$(echo $offset | cut -d ' ' -f 2)" echo "🤖 Processing architecture '$arch' at offset $arch_offset..." diff --git a/mkspecs/features/win32/separate_debug_info.prf b/mkspecs/features/win32/separate_debug_info.prf index 2838020f01..8550fdda15 100644 --- a/mkspecs/features/win32/separate_debug_info.prf +++ b/mkspecs/features/win32/separate_debug_info.prf @@ -13,6 +13,10 @@ have_target:!static:!isEmpty(QMAKE_OBJCOPY) { QMAKE_POST_LINK = $$copy_debug_info && $$strip_debug_info && $$link_debug_info $$QMAKE_POST_LINK silent:QMAKE_POST_LINK = @echo creating $@.debug && $$QMAKE_POST_LINK - target.targets += $$QMAKE_TARGET_DEBUG_INFO + contains(TEMPLATE, lib$):!plugin { + dlltarget.targets += $$QMAKE_TARGET_DEBUG_INFO + } else { + target.targets += $$QMAKE_TARGET_DEBUG_INFO + } QMAKE_DISTCLEAN += $$QMAKE_TARGET_DEBUG_INFO } |