diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2012-11-23 14:22:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 15:28:01 +0100 |
| commit | 00cf1f47c49d9e7fed9f58095f2ac176b6fdf374 (patch) | |
| tree | d2772ec4cf423220d603107bb6fa2bfe8c8567a1 | |
| parent | d34f03c609b4a2190de30375c3bbf02e00aba941 (diff) | |
QT7: Remove usage of QMAKE_MAC_XARCH
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>
| -rw-r--r-- | src/plugins/qt7/qt7.pro | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index 4dba3fd5a..edc3ddde6 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -20,14 +20,10 @@ LIBS += -framework AppKit -framework AudioUnit \ -framework AudioToolbox -framework CoreAudio \ -framework QuartzCore -framework QTKit -# The Quicktime framework is only awailable for 32-bit builds, so we -# need to check for this before linking against it. -# QMAKE_MAC_XARCH is not awailable on Tiger, but at the same time, -# we never build for 64-bit architechtures on Tiger either: -contains(QMAKE_MAC_XARCH, no) { +# QUICKTIME_C_API_AVAILABLE is true only on i386 +# so make sure to link QuickTime +contains(QMAKE_HOST.arch, i386) { LIBS += -framework QuickTime -} else { - LIBS += -Xarch_i386 -framework QuickTime -Xarch_ppc -framework QuickTime } HEADERS += \ |