Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update of the QScriptValue autotest suite.
  New autotests cases for QScriptValue autotests generator.
  QScriptValue autotest generator templates change.
  Fix license template.
  QScriptValue::isQMetaObject crash fix.
  Implement toLatin1_helper with SSE2
  Doc: add \since 4.7 to new QtMultimedia classes
  Autotest: add a test to ensure that the Qt headers are clean.
  Compile on Linux: close(2) is defined in #include <unistd.h>
  Improved gesture event delivery in graphicsview.
  Fixed a gesture autotest.
  Cache scene coordinates of a hotspot in a QGesture.
  Add an extra operator delete() to QSharedPointer's internals.
  Fix compilation on x86 with gcc if SSE2 is not enabled
  Comments the SSE implementation of fromLatin1_helper()
  Build fixes for the SIMD functions
  Implement QString::fromLatin1_helper() with SSE2
  Cache the result of qDetectCPUFeatures()
  Move the SIMD detection from QtGui to QtCore
  Prevent stale QWidget pointers in QCocoaView

1 files changed, 2 insertions, 0 deletions

diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 3406e41..6d64915 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -33,6 +33,7 @@ HEADERS +=  \
         tools/qsharedpointer.h \
         tools/qsharedpointer_impl.h \
         tools/qset.h \
+        tools/qsimd_p.h \
         tools/qsize.h \
         tools/qstack.h \
         tools/qstring.h \
@@ -68,6 +69,7 @@ SOURCES += \
         tools/qregexp.cpp \
         tools/qshareddata.cpp \
         tools/qsharedpointer.cpp \
+        tools/qsimd.cpp \
         tools/qsize.cpp \
         tools/qstring.cpp \
         tools/qstringbuilder.cpp \