summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2010-04-07 11:30:13 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2010-04-07 11:30:13 (GMT)
commit0dd9960cbc533e377c8cc38b9e81b14108fac9be (patch)
tree153d8b593f59de89621ed9148b772c0c63d9e9cc
parentf23160f2b8a76619a7e8721aec880be3cf25a7a0 (diff)
downloadQt-0dd9960cbc533e377c8cc38b9e81b14108fac9be.zip
Qt-0dd9960cbc533e377c8cc38b9e81b14108fac9be.tar.gz
Qt-0dd9960cbc533e377c8cc38b9e81b14108fac9be.tar.bz2
Mac: Make universal ppc/x86 builds compile.
We need to enable/disable MMX etc at compile time, not at configure time.
-rw-r--r--src/gui/painting/qdrawhelper_p.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h
index f5b17ea..acf765c 100644
--- a/src/gui/painting/qdrawhelper_p.h
+++ b/src/gui/painting/qdrawhelper_p.h
@@ -69,6 +69,13 @@
QT_BEGIN_NAMESPACE
+#if defined(Q_OS_MAC) && (defined(__ppc__) || defined(__ppc64__))
+#undef QT_HAVE_MMX
+#undef QT_HAVE_SSE
+#undef QT_HAVE_SSE2
+#undef QT_HAVE_3DNOW
+#endif
+
#if defined(Q_CC_MSVC) && _MSCVER <= 1300 && !defined(Q_CC_INTEL)
#define Q_STATIC_TEMPLATE_SPECIALIZATION static
#else