diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2016-03-20 20:44:13 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2016-03-27 12:38:18 +0200 |
commit | bbb46a885d3666d6f49b3911efd63aa44ae980e1 (patch) | |
tree | 3981452535aca9ed66bec5e95244a9cee6f4c7c7 | |
parent | 32aaa52ed4f9d34339d09bc9f83a762151c0702d (diff) | |
download | rockbox-bbb46a885d3666d6f49b3911efd63aa44ae980e1.tar.gz rockbox-bbb46a885d3666d6f49b3911efd63aa44ae980e1.zip |
Improve handling of Qt5 subversions on OS X.
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
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 243e592255..0b1f5fde54 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -218,14 +218,22 @@ macx:!intel { | |||
218 | QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk | 218 | QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk |
219 | } | 219 | } |
220 | macx:intel { | 220 | macx:intel { |
221 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386 | ||
222 | contains(QT_MAJOR_VERSION, 5) { | 221 | contains(QT_MAJOR_VERSION, 5) { |
223 | QMAKE_MAC_SDK=macosx | 222 | QMAKE_MAC_SDK=macosx |
223 | greaterThan(QT_MINOR_VERSION, 5) { | ||
224 | QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 | ||
225 | message("Qt 5.6+ detected: setting deploy target to 10.7") | ||
226 | } | ||
227 | !greaterThan(QT_MINOR_VERSION, 5) { | ||
228 | QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 | ||
229 | message("Qt up to 5.5 detected: setting deploy target to 10.6") | ||
230 | } | ||
224 | } | 231 | } |
225 | !contains(QT_MAJOR_VERSION, 5) { | 232 | !contains(QT_MAJOR_VERSION, 5) { |
226 | QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk | 233 | QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk |
234 | QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 | ||
235 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386 | ||
227 | } | 236 | } |
228 | QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 | ||
229 | } | 237 | } |
230 | macx { | 238 | macx { |
231 | CONFIG += x86 | 239 | CONFIG += x86 |