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

Conflicts:
	src/corelib/io/qiodevice_p.h
	src/corelib/kernel/qvariant_p.h
	src/corelib/tools/qsimd.cpp
	src/gui/kernel/qguiapplication.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp

Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a

1 files changed, 7 insertions, 8 deletions

diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
index 9271630b32..231f37fa05 100644
--- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
@@ -77,16 +77,15 @@ void tst_QIODevice::getSetCheck()
 {
     // OpenMode QIODevice::openMode()
     // void QIODevice::setOpenMode(OpenMode)
-    class MyIODevice : public QIODevice {
+    class MyIODevice : public QTcpSocket {
     public:
-        void setOpenMode(OpenMode openMode) { QIODevice::setOpenMode(openMode); }
+        using QTcpSocket::setOpenMode;
     };
-    QTcpSocket var1;
-    MyIODevice *obj1 = reinterpret_cast<MyIODevice*>(&var1);
-    obj1->setOpenMode(QIODevice::OpenMode(QIODevice::NotOpen));
-    QCOMPARE(QIODevice::OpenMode(QIODevice::NotOpen), obj1->openMode());
-    obj1->setOpenMode(QIODevice::OpenMode(QIODevice::ReadWrite));
-    QCOMPARE(QIODevice::OpenMode(QIODevice::ReadWrite), obj1->openMode());
+    MyIODevice var1;
+    var1.setOpenMode(QIODevice::OpenMode(QIODevice::NotOpen));
+    QCOMPARE(QIODevice::OpenMode(QIODevice::NotOpen), var1.openMode());
+    var1.setOpenMode(QIODevice::OpenMode(QIODevice::ReadWrite));
+    QCOMPARE(QIODevice::OpenMode(QIODevice::ReadWrite), var1.openMode());
 }
 
 //----------------------------------------------------------------------------------