summaryrefslogtreecommitdiffstats
path: root/src/corelib/corelib.pro
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2010-08-06 13:09:02 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2010-08-06 13:09:02 (GMT)
commit8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143 (patch)
tree4f19a338ad94e70992a95166544afacac45ef2e1 /src/corelib/corelib.pro
parentd8ecf6b6f6b6c0f532a4c9f25bcd36e808dc0d2a (diff)
parentb738719a192c49f9bab64cebfa2bad67b9630870 (diff)
downloadQt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.zip
Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.tar.gz
Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Conflicts: src/dbus/qdbusmacros.h
Diffstat (limited to 'src/corelib/corelib.pro')
-rw-r--r--src/corelib/corelib.pro15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index dba2a42..bbf445f 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -66,6 +66,21 @@ sse {
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
}