From c18908d6bd493ea11c37df20dba3bc07d04539c2 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Thu, 20 Mar 2014 22:20:11 +0100 Subject: OS X: update project file for Qt5 support. - Qt5 doesn't support PPC anymore, so always build for x86 only. - Qt5 requires the use of the multimedia module (as Windows). Change-Id: I7d54faffe9d2fb557f55234ba7b81a508d92a38b --- rbutil/rbutilqt/rbutilqt.pro | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'rbutil/rbutilqt/rbutilqt.pro') diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index a0ff344fbb..10ac30d085 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -140,6 +140,9 @@ contains(QT_MAJOR_VERSION, 5) { win32 { QT += multimedia } + macx { + QT += multimedia + } } dbg { @@ -187,6 +190,12 @@ unix:!macx:static { } # if -config intel is specified use 10.5 SDK and don't build for PPC +contains(QT_MAJOR_VERSION, 5) { + macx { + CONFIG += intel + message("Qt5 doesn't support PPC anymore, building x86 only") + } +} macx:!intel { CONFIG += ppc QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc @@ -195,7 +204,12 @@ macx:!intel { } macx:intel { QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386 - QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk + contains(QT_MAJOR_VERSION, 5) { + QMAKE_MAC_SDK=macosx + } + !contains(QT_MAJOR_VERSION, 5) { + QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk + } QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 } macx { -- cgit v1.2.3