Merge pull request jamulussoftware#3235 from softins/mac-legacy-update

Update Mac Legacy from Qt 5.9.9 to 5.15.2
pljones · Jun 7, 2024 · db0724f · db0724f
2 parents bb1639a + 96abf40
commit db0724f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 47 deletions.
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -238,7 +238,7 @@ jobs:
           - config_name:            MacOS Legacy (artifacts+CodeQL)
             target_os:              macos
             building_on_os:         macos-12
-            base_command:           QT_VERSION=5.9.9 SIGN_IF_POSSIBLE=0 ARTIFACT_SUFFIX=_legacy ./.github/autobuild/mac.sh
+            base_command:           QT_VERSION=5.15.2 SIGN_IF_POSSIBLE=0 ARTIFACT_SUFFIX=_legacy ./.github/autobuild/mac.sh
             # Enable CodeQL on mac legacy as this version does not get signed
             run_codeql:             true
             # For Qt5 on Mac, we need to use an unsupported SDK version as macOS 12 doesn't

diff --git a/Jamulus.pro b/Jamulus.pro
@@ -190,11 +190,7 @@ win32 {
         MACOSX_BUNDLE_ICON.path = Contents/Resources
         QMAKE_BUNDLE_DATA += MACOSX_BUNDLE_ICON
     } else {
-        equals(QT_VERSION, "5.9.9") {
-            QMAKE_INFO_PLIST = mac/Info-make-legacy.plist
-        } else {
-            QMAKE_INFO_PLIST = mac/Info-make.plist
-        }
+        QMAKE_INFO_PLIST = mac/Info-make.plist
     }
 
     LIBS += -framework CoreFoundation \

diff --git a/mac/Info-make-legacy.plist b/mac/Info-make-legacy.plist