summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik van Pienbroek <epienbro@fedoraproject.org>2012-12-10 19:42:31 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-11 03:08:33 (GMT)
commita2a08014bc2f09a7be48b2127f72e8e4a4c33515 (patch)
tree27565a6ba4aad92cc6eba54088817837e86c0929 /src
parentda78498cb3f18fe1391de9387f88629f56e4aa8c (diff)
downloadQt-a2a08014bc2f09a7be48b2127f72e8e4a4c33515.zip
Qt-a2a08014bc2f09a7be48b2127f72e8e4a4c33515.tar.gz
Qt-a2a08014bc2f09a7be48b2127f72e8e4a4c33515.tar.bz2
Fix SSSE3 support build failure on mingw
Commit 94253f3472a13ac4eab3ccfbbba9d14165647f85 made QMAKE_MAC_XARCH to be set to 'no' for MinGW environments. Due to this change building for MinGW environments where SSSE3 support is available got broken. While building the imageformats plugin qjpeg4 the following error occurs: undefined reference to `_imp___Z32qt_convert_rgb888_to_rgb32_ssse3PjPKhi' This commit makes building Qt on MinGW environments where SSSE3 support is available working again Change-Id: Ib2a4b3cc244af8bdde70d2d2240c70ff0e7a4cc2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
Diffstat (limited to 'src')
-rw-r--r--src/gui/gui.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index e8f9d1f..5a9e57c 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -80,7 +80,7 @@ win32:!contains(QT_CONFIG, directwrite) {
DEFINES += QT_NO_DIRECTWRITE
}
-contains(QMAKE_MAC_XARCH, no) {
+mac:contains(QMAKE_MAC_XARCH, no) {
DEFINES += QT_NO_MAC_XARCH
} else {
win32-g++*|!win32:!win32-icc*:!macx-icc* {