slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

QT7: Remove usage of QMAKE_MAC_XARCH

Browse Source 
Support for QMAKE_MAC_XARCH was removed in Qt 5.0, so it shouldn't be
used in the QT7 plugin, as it causes build failures.

Task-number: QTBUG-27180
Change-Id: I7d907a9afbcbc4989b794350c94d0f619e4d2b7d
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
This commit is contained in:
Andy Nichols
2012-11-23 14:22:04 +01:00
committed by The Qt Project
parent d34f03c609
commit 00cf1f47c4
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt7/qt7.pro
View File

@@ -20,14 +20,10 @@ LIBS += -framework AppKit -framework AudioUnit \
-framework AudioToolbox -framework CoreAudio \ -framework AudioToolbox -framework CoreAudio \
-framework QuartzCore -framework QTKit -framework QuartzCore -framework QTKit
# The Quicktime framework is only awailable for 32-bit builds, so we # QUICKTIME_C_API_AVAILABLE is true only on i386
# need to check for this before linking against it. # so make sure to link QuickTime
# QMAKE_MAC_XARCH is not awailable on Tiger, but at the same time, contains(QMAKE_HOST.arch, i386) {
# we never build for 64-bit architechtures on Tiger either:
contains(QMAKE_MAC_XARCH, no) {
LIBS += -framework QuickTime LIBS += -framework QuickTime
} else {
LIBS += -Xarch_i386 -framework QuickTime -Xarch_ppc -framework QuickTime
} }
HEADERS += \ HEADERS += \