mirror of
https://github.com/status-im/status-app.git
synced 2026-08-27 07:01:14 +00:00
fix: Align min ios version with Qt6.11
This commit is contained in:
committed by
Jonathan Rainville
parent
c09b6e44dd
commit
9f06b8d243
+1
-1
@@ -144,7 +144,7 @@ The build system uses several environment variables to control the build process
|
||||
|
||||
#### iOS-specific Variables
|
||||
- `IPHONE_SDK`: iOS SDK to use (`iphoneos` or `iphonesimulator`)
|
||||
- `IOS_TARGET`: Minimum iOS version (26 for Qt6)
|
||||
- `IOS_TARGET`: Minimum iOS version (17 for Qt6)
|
||||
|
||||
### Qt Version Compatibility
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ ifeq ($(OS), ios)
|
||||
# iOS
|
||||
#SDKs: iphonesimulator, iphoneos
|
||||
IPHONE_SDK?=iphonesimulator
|
||||
IOS_TARGET?=26
|
||||
IOS_TARGET?=17
|
||||
|
||||
ifeq ($(IPHONE_SDK), iphoneos)
|
||||
ARCH=arm64
|
||||
|
||||
@@ -22,7 +22,7 @@ if [[ "$OS" == "ios" ]]; then
|
||||
COMMON_CMAKE_CONFIG+=(
|
||||
-DCMAKE_OSX_ARCHITECTURES:STRING="$ARCH"
|
||||
-DCMAKE_OSX_SYSROOT="$SDK"
|
||||
-DCMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET=26.0
|
||||
-DCMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET=17.0
|
||||
)
|
||||
elif [[ "$OS" == "android" ]]; then
|
||||
if [[ "$ARCH" == "arm64" ]]; then
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
SDK=${SDK:-"iphonesimulator"}
|
||||
XCODE_SDK_PATH=$(xcrun --sdk "$SDK" --show-sdk-path)
|
||||
CLANG=$(xcrun --sdk "$SDK" --find clang)
|
||||
IOS_TARGET=${IOS_TARGET:-26}
|
||||
IOS_TARGET=${IOS_TARGET:-17}
|
||||
ARCH=${ARCH:-"amd64"}
|
||||
|
||||
EXTRA_ARGS=()
|
||||
|
||||
@@ -44,8 +44,8 @@ select_device() {
|
||||
echo "Invalid selection. Exiting."; exit 1;
|
||||
fi
|
||||
|
||||
DEVICE_ID=$(echo "$selected_line" | awk '{print $3}')
|
||||
DEVICE_NAME=$(echo "$selected_line" | awk '{print substr($0, 1, index($0, $3)-2)}' | xargs)
|
||||
DEVICE_ID=$(echo "$selected_line" | grep -oE '[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}')
|
||||
DEVICE_NAME=$(echo "$selected_line" | awk -F ' +' '{print $1}' | xargs)
|
||||
}
|
||||
|
||||
# Present the list of available simulators and let the user pick one
|
||||
|
||||
@@ -68,7 +68,7 @@ ios {
|
||||
QMAKE_CFLAGS += -Wno-implicit-function-declaration
|
||||
|
||||
QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist
|
||||
QMAKE_IOS_DEPLOYMENT_TARGET=26.0
|
||||
QMAKE_IOS_DEPLOYMENT_TARGET=17.0
|
||||
|
||||
QMAKE_ASSET_CATALOGS += $$PWD/../ios/Images.xcassets
|
||||
QMAKE_IOS_LAUNCH_SCREEN = $$PWD/../ios/launch-image-universal.storyboard
|
||||
|
||||
Reference in New Issue
Block a user