diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 09:00:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 09:00:05 (GMT) |
| commit | c1bac607f3f3889d367e20c128acf30dc9537ddc (patch) | |
| tree | e57d847c0a24a6b5e129eb7d58e671f5c075b3c4 /src/corelib | |
| parent | f47200c7eb91c3709f88647c9472786038f15478 (diff) | |
| parent | 2a671ee511a62fe04d53e9994b99e2cf8d525cb9 (diff) | |
| download | Qt-c1bac607f3f3889d367e20c128acf30dc9537ddc.zip Qt-c1bac607f3f3889d367e20c128acf30dc9537ddc.tar.gz Qt-c1bac607f3f3889d367e20c128acf30dc9537ddc.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:
Add the qt_ prefix to convert_rgb888_to_rgb32_ssse3
Update changes-4.7.0
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 'src/corelib')
| -rw-r--r-- | src/corelib/corelib.pro | 37 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 |
2 files changed, 6 insertions, 37 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index bbf445f..bc8ef9f 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -53,39 +53,6 @@ symbian: { DEPLOYMENT = partial_upgrade $$DEPLOYMENT } -mmx { - DEFINES += QT_HAVE_MMX -} -3dnow { - DEFINES += QT_HAVE_3DNOW -} -sse { - DEFINES += QT_HAVE_SSE - DEFINES += 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 -} -neon { - DEFINES += QT_HAVE_NEON - QMAKE_CXXFLAGS *= -mfpu=neon -} +neon: QMAKE_CXXFLAGS *= -mfpu=neon + diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7b915cd..8f27b03 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -981,9 +981,11 @@ redefine to built-in booleans to make autotests work properly */ # undef QT_DEPRECATED_VARIABLE # undef QT_DEPRECATED_CONSTRUCTOR #elif defined(QT_DEPRECATED_WARNINGS) +# ifdef QT3_SUPPORT /* enable Qt3 support warnings as well */ -# undef QT3_SUPPORT_WARNINGS -# define QT3_SUPPORT_WARNINGS +# undef QT3_SUPPORT_WARNINGS +# define QT3_SUPPORT_WARNINGS +# endif # undef QT_DEPRECATED # define QT_DEPRECATED Q_DECL_DEPRECATED # undef QT_DEPRECATED_VARIABLE |