Build: iOS: Use Qt6 and bump build environment

Crash-fix by @danryu. Co-authored-by: Dan G <[email protected]> Fixes: jamulussoftware#2711 Fixes: jamulussoftware#2939 Fixes: jamulussoftware#2907
ann0see · May 11, 2023 · 893a33b · 893a33b
1 parent 5034975
commit 893a33b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/autobuild/ios.sh b/.github/autobuild/ios.sh
@@ -34,7 +34,7 @@ setup() {
             # Starting with Qt6, ios' qtbase install does no longer include a real qmake binary.
             # Instead, it is a script which invokes the mac desktop qmake.
             # As of aqtinstall 2.1.0 / 04/2022, desktop qtbase has to be installed manually:
-            python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop "${QT_VERSION}" --archives qtbase
+            # python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop "${QT_VERSION}" --archives qtbase
         fi
     fi
 }

diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -251,13 +251,13 @@ jobs:
 
           - config_name:            iOS (artifacts)
             target_os:              ios
-            building_on_os:         macos-10.15
-            base_command:           QT_VERSION=5.15.2 ./.github/autobuild/ios.sh
+            building_on_os:         macos-12
+            base_command:           QT_VERSION=6.4.3 ./.github/autobuild/ios.sh
             # Build failed with CodeQL enabled when last tested 03/2022 (#2490).
             # There are no hints that iOS is supposed to be supported by CodeQL.
             # Therefore, disable it:
             run_codeql:             false
-            xcode_version:          12.1.1
+            xcode_version:          14.2.0
 
           - config_name:            Windows (artifact+codeQL)
             target_os:              windows

diff --git a/Jamulus.pro b/Jamulus.pro
@@ -232,6 +232,7 @@ win32 {
     HEADERS += src/sound/coreaudio-ios/sound.h
     OBJECTIVE_SOURCES += src/sound/coreaudio-ios/sound.mm
     QMAKE_TARGET_BUNDLE_PREFIX = io.jamulus
+    QMAKE_LFLAGS += -Wl,-e,_qt_main_wrapper
     LIBS += -framework AVFoundation \
         -framework AudioToolbox
 } else:android {