Skip to content

Commit d3393c3

Browse files
Merge pull request #770 from g-maxime/Qt5.12
Lower minimal macOS version
2 parents 69c2459 + 975a08f commit d3393c3

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

.github/workflows/MediaConch_Checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
run: |
9191
cd Project/Qt
9292
export PATH=/usr/local/opt/qt@5/bin:$PATH
93-
./prepare INCLUDEPATH+=/usr/local/include CONFIG+=c++11 -after QMAKE_MACOSX_DEPLOYMENT_TARGET=10.9
93+
./prepare INCLUDEPATH+=/usr/local/include CONFIG+=c++11 -after QMAKE_MACOSX_DEPLOYMENT_TARGET=10.9 QMAKE_LFLAGS-=-Wl,-ld_classic
9494
- name: Build GUI
9595
run: |
9696
cd Project/Qt

Project/Mac/Info-ns.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
<key>DTSDKBuild</key>
3232
<string>10K549</string>
3333
<key>DTSDKName</key>
34-
<string>macosx10.13</string>
34+
<string>macosx10.10</string>
3535
<key>DTXcode</key>
3636
<string>0420</string>
3737
<key>DTXcodeBuild</key>
3838
<string>4C199</string>
3939
<key>LSApplicationCategoryType</key>
4040
<string>public.app-category.utilities</string>
4141
<key>LSMinimumSystemVersion</key>
42-
<string>10.13</string>
42+
<string>10.10</string>
4343
<key>NSHumanReadableCopyright</key>
4444
<string>(c) MediaArea.net</string>
4545
<key>NSMainNibFile</key>

Project/Mac/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
<key>DTSDKBuild</key>
3232
<string>10K549</string>
3333
<key>DTSDKName</key>
34-
<string>macosx10.13</string>
34+
<string>macosx10.10</string>
3535
<key>DTXcode</key>
3636
<string>0420</string>
3737
<key>DTXcodeBuild</key>
3838
<string>4C199</string>
3939
<key>LSApplicationCategoryType</key>
4040
<string>public.app-category.utilities</string>
4141
<key>LSMinimumSystemVersion</key>
42-
<string>10.13</string>
42+
<string>10.10</string>
4343
<key>NSHumanReadableCopyright</key>
4444
<string>(c) MediaArea.net</string>
4545
<key>NSMainNibFile</key>

Project/Qt/MediaConch.pro

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,13 +345,15 @@ contains(NO_LIBEVENT, yes|1) {
345345
}
346346

347347
macx:contains(MACSTORE, yes|1) {
348+
QMAKE_LFLAGS+=-Wl,-ld_classic
348349
QMAKE_CFLAGS += -gdwarf-2
349350
QMAKE_CXXFLAGS += -gdwarf-2
350351
QMAKE_INFO_PLIST = ../Mac/Info.plist
351-
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
352+
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
352353
} else:macx {
354+
QMAKE_LFLAGS+=-Wl,-ld_classic
353355
QMAKE_INFO_PLIST = ../Mac/Info-ns.plist
354-
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
356+
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
355357
}
356358

357359
LIBS += -lz

0 commit comments

Comments
 (0)