diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:41 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:52 +0200 |
| commit | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (patch) | |
| tree | 29bf116bfda2ccf61057115690d14f85cc9b085b /mkspecs | |
| parent | 4a9fb41a7947d0bb7a47a9625603a436df288b24 (diff) | |
| parent | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
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 |