Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/gui/painting/qdrawhelper.cpp
	src/plugins/platforms/xcb/qxcbnativeinterface.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.h
	src/testlib/qtestblacklist.cpp
	src/tools/qdoc/node.cpp
	src/tools/qdoc/node.h
	tests/auto/gui/painting/qcolor/tst_qcolor.cpp

Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684

1 files changed, 0 insertions, 19 deletions

diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
index 7d17794c0b..ca9f6cb9f4 100644
--- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
+++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
@@ -39,7 +39,6 @@
 #include <qcolor.h>
 #include <qdebug.h>
 #include <qrgba64.h>
-#include <private/qdrawingprimitive_sse2_p.h>
 
 class tst_QColor : public QObject
 {
@@ -105,7 +104,6 @@ private slots:
     void achromaticHslHue();
 
     void premultiply();
-    void unpremultiply_sse4();
     void qrgba64();
     void qrgba64Premultiply();
     void qrgba64Equivalence();
@@ -1451,23 +1449,6 @@ void tst_QColor::premultiply()
     }
 }
 
-void tst_QColor::unpremultiply_sse4()
-{
-    // Tests that qUnpremultiply_sse4 returns the same as qUnpremultiply.
-#if QT_COMPILER_SUPPORTS_HERE(SSE4_1)
-    if (qCpuHasFeature(SSE4_1)) {
-        for (uint a = 0; a < 256; a++) {
-            for (uint c = 0; c <= a; c++) {
-                QRgb p = qRgba(c, a-c, c, a);
-                QCOMPARE(qUnpremultiply_sse4(p), qUnpremultiply(p));
-            }
-        }
-        return;
-    }
-#endif
-    QSKIP("SSE4 not supported on this CPU.");
-}
-
 void tst_QColor::qrgba64()
 {
     QRgba64 rgb64 = QRgba64::fromRgba(0x22, 0x33, 0x44, 0xff);