diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 12:09:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 12:09:47 (GMT) |
| commit | 73956dde054abb6504c3e5609778bf16548768b9 (patch) | |
| tree | 5a071389332cfe2ae20dffa2f5180d92eed59542 /mkspecs | |
| parent | dfb56c408b2561c194922f36a0d08c2dc7c43f9b (diff) | |
| parent | 57d4e5aae33d27f4989c76269f23e837b8dff451 (diff) | |
| download | Qt-73956dde054abb6504c3e5609778bf16548768b9.zip Qt-73956dde054abb6504c3e5609778bf16548768b9.tar.gz Qt-73956dde054abb6504c3e5609778bf16548768b9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use the fast conversion from RGB888 to RGB32 for Jpeg images
Move the SIMD defines to the common declaration of Qt symbols
Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORT
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index e8946de..aa0f06e 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -209,3 +209,16 @@ wince*:static:gui { mac { !isEmpty(QT_NAMESPACE_MAC_CRC):DEFINES *= QT_NAMESPACE_MAC_CRC=$$QT_NAMESPACE_MAC_CRC } + +#SIMD defines: +neon: DEFINES += QT_HAVE_NEON +mmx:DEFINES += QT_HAVE_MMX +3dnow:DEFINES += QT_HAVE_3DNOW +sse:DEFINES += QT_HAVE_SSE QT_HAVE_MMXEXT +sse2:DEFINES += QT_HAVE_SSE2 +sse3:DEFINES += QT_HAVE_SSE3 +ssse3:DEFINES += QT_HAVE_SSSE3 +sse4_1:DEFINES += QT_HAVE_SSE4_1 +sse4_2:DEFINES += QT_HAVE_SSE4_2 +avx:DEFINES += QT_HAVE_AVX +iwmmxt:DEFINES += QT_HAVE_IWMMXT |