Skip to content

Commit db0724f

Browse files
authored
Merge pull request #3235 from softins/mac-legacy-update
Update Mac Legacy from Qt 5.9.9 to 5.15.2
2 parents bb1639a + 96abf40 commit db0724f

File tree

3 files changed

+2
-47
lines changed

3 files changed

+2
-47
lines changed

.github/workflows/autobuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ jobs:
238238
- config_name: MacOS Legacy (artifacts+CodeQL)
239239
target_os: macos
240240
building_on_os: macos-12
241-
base_command: QT_VERSION=5.9.9 SIGN_IF_POSSIBLE=0 ARTIFACT_SUFFIX=_legacy ./.github/autobuild/mac.sh
241+
base_command: QT_VERSION=5.15.2 SIGN_IF_POSSIBLE=0 ARTIFACT_SUFFIX=_legacy ./.github/autobuild/mac.sh
242242
# Enable CodeQL on mac legacy as this version does not get signed
243243
run_codeql: true
244244
# For Qt5 on Mac, we need to use an unsupported SDK version as macOS 12 doesn't

Jamulus.pro

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,7 @@ win32 {
190190
MACOSX_BUNDLE_ICON.path = Contents/Resources
191191
QMAKE_BUNDLE_DATA += MACOSX_BUNDLE_ICON
192192
} else {
193-
equals(QT_VERSION, "5.9.9") {
194-
QMAKE_INFO_PLIST = mac/Info-make-legacy.plist
195-
} else {
196-
QMAKE_INFO_PLIST = mac/Info-make.plist
197-
}
193+
QMAKE_INFO_PLIST = mac/Info-make.plist
198194
}
199195

200196
LIBS += -framework CoreFoundation \

mac/Info-make-legacy.plist

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)