diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 13:01:20 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 13:09:29 +0200 |
| commit | 576a8e152ec36e7465bfdc8ad63998cffbab4091 (patch) | |
| tree | 07472de61c7542a90f675869e480b99076c5b439 /mkspecs | |
| parent | fb7f30d2bad0c84ffea4db862a71ba2e03d855d0 (diff) | |
| parent | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (diff) | |
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/qt_plugin.prf | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 8cf067cd7e..fb67251600 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -204,13 +204,11 @@ mac { } #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 +avx2:DEFINES += QT_HAVE_AVX2 iwmmxt:DEFINES += QT_HAVE_IWMMXT diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index ce2b1d245b..a63ffab868 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -15,4 +15,4 @@ contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_no load(qt_targets) wince*:LIBS += $$QMAKE_LIBS_GUI - +QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF |