diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-13 16:58:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-13 16:58:06 (GMT) |
| commit | 36b56ef1b0034758fa6ade302177365ebce9899a (patch) | |
| tree | 39512ff2f2800590e03fee82a509574c7af200d5 /mkspecs/features/qt.prf | |
| parent | 10014ccb8f304f9b3ee796a2dbb8775c4c560a83 (diff) | |
| parent | 5114fcb45d584ea50da7397088f084dfd74922b9 (diff) | |
| download | Qt-36b56ef1b0034758fa6ade302177365ebce9899a.zip Qt-36b56ef1b0034758fa6ade302177365ebce9899a.tar.gz Qt-36b56ef1b0034758fa6ade302177365ebce9899a.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (354 commits)
Clean up rasterfallback mechanism in DirectFB
QNAM HTTP: Fix crash related to aborted uploads
Destroy the old runtime system only when existing pixmaps were migrated.
Fixed autotest failure in tst_qgl::clipTest.
Properly emit geometryChanged() when the position change.
Make bld.inf target in Symbian mkspecs to depend on .pro file
Fixed build failure
Added way to destroy the share widget in the GL graphics system.
QCoreApplication::library path, ensure mutex lock ordering
Fix memory leak.
QAudioOutput(ALSA); Fix check for available devices.
qdoc: All references to -assistant and -base were removed.
Only modify pixmap cache reply when protected by a mutex
Fix broken example code
Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
update Russian translations for Qt and tools
Updated Slovenian translations for Qt 4.7
doc: The QML Qt element was missing from the documentation.
Added documentation for Spectrum Analyzer demo
Do not include Spectrum Analyzer demo in static builds
...
Diffstat (limited to 'mkspecs/features/qt.prf')
| -rw-r--r-- | mkspecs/features/qt.prf | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index e8946de..4fd804d 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -31,9 +31,6 @@ plugin { #Qt plugins } } -#handle modules -for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod) - #handle includes INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt @@ -209,3 +206,15 @@ wince*:static:gui { mac { !isEmpty(QT_NAMESPACE_MAC_CRC):DEFINES *= QT_NAMESPACE_MAC_CRC=$$QT_NAMESPACE_MAC_CRC } + +#SIMD defines: +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 |