devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Improve handling of Qt5 subversions on OS X.

Browse source 
Qt 5.6 on OS X requires targeting at least OS X 10.7, while for earlier
versions we can still target 10.6. Handle this case and inform the user about
the used target version.

Change-Id: I78e426037e2966241ab9a63105e04e7366b469ed
This commit is contained in:
Dominik Riebeling 2016-03-20 20:44:13 +01:00
parent 32aaa52ed4
commit bbb46a885d
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rbutil/rbutilqt/rbutilqt.pro
View file

@ -218,14 +218,22 @@ macx:!intel {
QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
} }
macx:intel { macx:intel {
QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386
contains(QT_MAJOR_VERSION, 5) { contains(QT_MAJOR_VERSION, 5) {
QMAKE_MAC_SDK=macosx QMAKE_MAC_SDK=macosx
greaterThan(QT_MINOR_VERSION, 5) {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
message("Qt 5.6+ detected: setting deploy target to 10.7")
}
!greaterThan(QT_MINOR_VERSION, 5) {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
message("Qt up to 5.5 detected: setting deploy target to 10.6")
}
} }
!contains(QT_MAJOR_VERSION, 5) { !contains(QT_MAJOR_VERSION, 5) {
QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk
}
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386
}
} }
macx { macx {
CONFIG += x86 CONFIG += x86