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 a missing file in the config.test for SSE 4.2
  Remove the masking when computing qAlpha()
  Add support for more vector instructions on x86
  Workaround gcc bug, disable test with old version of gcc
  Do not crash due to a infinite recursion when using voiceover on MacOS
  doc: Fix qdoc errors for text related files
  QGraphicsItem: Animation leaves drawing artifacts when clipping is used.
  moc: Slot with complex template default value does not compile

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
 }