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

Conflicts:
	src/corelib/io/io.pri
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/network/socket/qabstractsocket.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
	src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
	src/widgets/styles/qgtkstyle.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
	tests/auto/dbus/qdbusconnection/qdbusconnection.pro
	tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp

Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7

1 files changed, 1 insertions, 32 deletions

diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
index 9833d17a1c..8cb9aa70e9 100644
--- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
+++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2015 Intel Corporation.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -172,10 +173,6 @@ QDBusPendingCall tst_QDBusPendingCall::sendError()
 void tst_QDBusPendingCall::waitForFinished()
 {
     QDBusPendingCall ac = sendMessage();
-    QVERIFY(!ac.isFinished());
-    QVERIFY(!ac.isError());
-    QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage);
-
     ac.waitForFinished();
     QVERIFY(ac.isFinished());
     QVERIFY(!ac.isError());
@@ -195,10 +192,6 @@ void tst_QDBusPendingCall::waitForFinished()
 void tst_QDBusPendingCall::waitForFinished_error()
 {
     QDBusPendingCall ac = sendError();
-    QVERIFY(!ac.isFinished());
-    QVERIFY(!ac.isError());
-    QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage);
-
     ac.waitForFinished();
     QVERIFY(ac.isFinished());
     QVERIFY(ac.isError());
@@ -254,10 +247,6 @@ void tst_QDBusPendingCall::callWithCallback_localLoop_errorReply()
 void tst_QDBusPendingCall::watcher()
 {
     QDBusPendingCall ac = sendMessage();
-    QVERIFY(!ac.isFinished());
-    QVERIFY(!ac.isError());
-    QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage);
-
     callCount = 0;
     watchArgument = 0;
 
@@ -284,10 +273,6 @@ void tst_QDBusPendingCall::watcher()
 void tst_QDBusPendingCall::watcher_error()
 {
     QDBusPendingCall ac = sendError();
-    QVERIFY(!ac.isFinished());
-    QVERIFY(!ac.isError());
-    QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage);
-
     callCount = 0;
     watchArgument = 0;
 
@@ -312,10 +297,6 @@ void tst_QDBusPendingCall::watcher_error()
 void tst_QDBusPendingCall::watcher_waitForFinished()
 {
     QDBusPendingCall ac = sendMessage();
-    QVERIFY(!ac.isFinished());
-    QVERIFY(!ac.isError());
-    QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage);
-
     callCount = 0;
     watchArgument = 0;
 
@@ -391,10 +372,6 @@ void tst_QDBusPendingCall::watcher_waitForFinished_threaded()
 void tst_QDBusPendingCall::watcher_waitForFinished_alreadyFinished()
 {
     QDBusPendingCall ac = sendMessage();
-    QVERIFY(!ac.isFinished());
-    QVERIFY(!ac.isError());
-    QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage);
-
     ac.waitForFinished();
     QVERIFY(ac.isFinished());
     QVERIFY(!ac.isError());
@@ -425,10 +402,6 @@ void tst_QDBusPendingCall::watcher_waitForFinished_alreadyFinished()
 void tst_QDBusPendingCall::watcher_waitForFinished_alreadyFinished_eventLoop()
 {
     QDBusPendingCall ac = sendMessage();
-    QVERIFY(!ac.isFinished());
-    QVERIFY(!ac.isError());
-    QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage);
-
     ac.waitForFinished();
     QVERIFY(ac.isFinished());
     QVERIFY(!ac.isError());
@@ -462,10 +435,6 @@ void tst_QDBusPendingCall::watcher_waitForFinished_alreadyFinished_eventLoop()
 void tst_QDBusPendingCall::watcher_waitForFinished_error()
 {
     QDBusPendingCall ac = sendError();
-    QVERIFY(!ac.isFinished());
-    QVERIFY(!ac.isError());
-    QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage);
-
     callCount = 0;
     watchArgument = 0;