Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits)
  Add expected failures for JS test suite on Symbian
  Ensure ListView contentHeight is set to a valid size.
  Revert "Add mirroring-positioners.qml example" that was accidentally pushed
  Fix dragging Flickable back over start point.
  Add mirroring-positioners.qml example
  A QAIM model resulted in items moving to incorrect locations
  Build on Symbian
  refuse to open empty translation files
  fix path separator matching
  fix -dont-process for mingw cross-build
  fix nonsense condition
  Fix qwidget test crash
  QmlViewer: Remove trailing whitespace
  QmlViewer: Remove trailing whitespace
  QmlViewer: Fix crash on exit
  Don't include <features.h> directly: non-standard header.
  Remove superfluous OpenGL linking for QtDeclarative
  Corrected case on Symbian library.
  Missing glyphs in GL when scaling QStaticText and QML text items
  PathView: removing the currentIndex could make it invalid.
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index d44a9d0..f862fc5 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -290,7 +290,13 @@ static inline uint detectProcessorFeatures()
     uint features = MMX|SSE|SSE2|CMOV;
     uint feature_result = 0;
 
-#if defined(Q_CC_GNU)
+#if defined (Q_OS_WIN64)
+    {
+       int info[4];
+       __cpuid(info, 1);
+       feature_result = info[2];
+    }
+#elif defined(Q_CC_GNU)
     quint64 tmp;
     asm ("xchg %%rbx, %1\n"
          "cpuid\n"
@@ -299,12 +305,6 @@ static inline uint detectProcessorFeatures()
         : "a" (1)
         : "%edx"
         );
-#elif defined (Q_OS_WIN64)
-    {
-       int info[4];
-       __cpuid(info, 1);
-       feature_result = info[2];
-    }
 #endif
 
     if (feature_result & (1u))