diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-25 23:54:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-25 23:54:53 (GMT) |
| commit | 22c2f6cfca945e9c377e509b7ff2252f55599b27 (patch) | |
| tree | 52bd13356ab78cf6b201b3d20aa4e555fbf17a10 /src/gui/painting/qdrawhelper_p.h | |
| parent | 8928e37c8b1b375e74c5981915c034123de11b3d (diff) | |
| parent | cf58c6bd5204edaff0a34bae5312798fc3700c94 (diff) | |
| download | Qt-22c2f6cfca945e9c377e509b7ff2252f55599b27.zip Qt-22c2f6cfca945e9c377e509b7ff2252f55599b27.tar.gz Qt-22c2f6cfca945e9c377e509b7ff2252f55599b27.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits)
Doc: Added a config file for creating Simplified Chinese docs directly.
Doc: add a few lines about bearer managment to "What's New" page.
Fix the SIMD implementations of QString::toLatin1()
Update of the QScriptValue autotest suite.
New data set for QScriptValue autotest generator.
Autotest: make tst_qchar run out-of-source too
Autotest: add a test for roundtrips through toLatin1/fromLatin1
Implement toLatin1_helper with Neon
QRegExp::pos() should return -1 for empty/non-matching captures
Revert "qdoc: Finished "Inherited by" list for QML elements."
Revert "qdoc: List new QML elements in \sincelist for What's New page."
Add the Unicode normalisation properties.
Autotest: add a test for QDBusPendingCallWatcher use in threads
Doc: placeholders for new feature highlights.
doc: mark as reimplemented.
Update of the QScriptValue autotest suite.
New autotests cases for QScriptValue autotests generator.
QScriptValue autotest generator templates change.
Fix license template.
QScriptValue::isQMetaObject crash fix.
...
Diffstat (limited to 'src/gui/painting/qdrawhelper_p.h')
| -rw-r--r-- | src/gui/painting/qdrawhelper_p.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index 2f78b00..f5b17ea 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -67,15 +67,6 @@ #include "QtGui/qscreen_qws.h" #endif -// Disable MMX and SSE on Mac/PPC builds, or if the compiler -// does not support -Xarch argument passing -#if defined(QT_NO_MAC_XARCH) || (defined(Q_OS_DARWIN) && (defined(__ppc__) || defined(__ppc64__))) -#undef QT_HAVE_SSE2 -#undef QT_HAVE_SSE -#undef QT_HAVE_3DNOW -#undef QT_HAVE_MMX -#endif - QT_BEGIN_NAMESPACE #if defined(Q_CC_MSVC) && _MSCVER <= 1300 && !defined(Q_CC_INTEL) |