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

Conflicts:
	qmake/library/qmakeevaluator.cpp
	(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
	src/corelib/kernel/qcore_mac_objc.mm
	src/gui/painting/qcolor.h
	src/plugins/platforms/cocoa/qcocoawindow.mm

Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31

5 files changed, 3 insertions, 124 deletions

diff --git a/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
index 0424fc47ed..96c4917473 100644
--- a/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
+++ b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
@@ -46,33 +46,6 @@ private slots:
     void parseMultipleCookies();
 };
 
-QT_BEGIN_NAMESPACE
-
-namespace QTest {
-    template<>
-    char *toString(const QNetworkCookie &cookie)
-    {
-        return qstrdup(cookie.toRawForm());
-    }
-
-    template<>
-    char *toString(const QList<QNetworkCookie> &list)
-    {
-        QByteArray result = "QList(";
-        bool first = true;
-        foreach (QNetworkCookie cookie, list) {
-            if (!first)
-                result += ", ";
-            first = false;
-            result += "QNetworkCookie(" + cookie.toRawForm() + ')';
-        }
-        result.append(')');
-        return qstrdup(result.constData());
-    }
-}
-
-QT_END_NAMESPACE
-
 void tst_QNetworkCookie::getterSetter()
 {
     QNetworkCookie cookie;
diff --git a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 8a1a5b8369..f9cc33fb26 100644
--- a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -55,34 +55,6 @@ private slots:
     void rfc6265();
 };
 
-QT_BEGIN_NAMESPACE
-
-namespace QTest {
-    template<>
-    char *toString(const QNetworkCookie &cookie)
-    {
-        return qstrdup(cookie.toRawForm());
-    }
-
-    template<>
-    char *toString(const QList<QNetworkCookie> &list)
-    {
-        QByteArray result = "QList(";
-        bool first = true;
-        foreach (QNetworkCookie cookie, list) {
-            if (!first)
-                result += ", ";
-            first = false;
-            result += "QNetworkCookie(" + cookie.toRawForm() + ')';
-        }
-
-        result.append(')');
-        return qstrdup(result.constData());
-    }
-}
-
-QT_END_NAMESPACE
-
 class MyCookieJar: public QNetworkCookieJar
 {
 public:
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 61927862f7..b3c8a4f66b 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -491,45 +491,6 @@ private:
 
 bool tst_QNetworkReply::seedCreated = false;
 
-QT_BEGIN_NAMESPACE
-
-namespace QTest {
-    template<>
-    char *toString(const QNetworkReply::NetworkError& code)
-    {
-        const QMetaObject *mo = &QNetworkReply::staticMetaObject;
-        int index = mo->indexOfEnumerator("NetworkError");
-        if (index == -1)
-            return qstrdup("");
-
-        QMetaEnum qme = mo->enumerator(index);
-        return qstrdup(qme.valueToKey(code));
-    }
-
-    template<>
-    char *toString(const QNetworkCookie &cookie)
-    {
-        return qstrdup(cookie.toRawForm());
-    }
-
-    template<>
-    char *toString(const QList<QNetworkCookie> &list)
-    {
-        QByteArray result = "QList(";
-        bool first = true;
-        foreach (QNetworkCookie cookie, list) {
-            if (!first)
-                result += ", ";
-            first = false;
-            result += "QNetworkCookie(" + cookie.toRawForm() + ')';
-        }
-        result.append(')');
-        return qstrdup(result.constData());
-    }
-}
-
-QT_END_NAMESPACE
-
 #define RUN_REQUEST(call)                       \
     do {                                        \
         QString errorMsg = call;                \
@@ -4963,7 +4924,7 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp()
         const int maxRate = rate * 1024 * (100+allowedDeviation) / 100;
         qDebug() << minRate << "<="<< server.transferRate << "<=" << maxRate << '?';
         // The test takes too long to run if sending enough data to overwhelm the
-        // reciever's kernel buffers.
+        // receiver's kernel buffers.
         //QEXPECT_FAIL("http+limited", "Limiting is broken right now, check QTBUG-15065", Continue);
         //QEXPECT_FAIL("https+limited", "Limiting is broken right now, check QTBUG-15065", Continue);
         //QVERIFY(server.transferRate >= minRate && server.transferRate <= maxRate);
diff --git a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
index a14aaf3cb1..bc9144e40e 100644
--- a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
+++ b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
@@ -56,33 +56,6 @@ private slots:
     void removeHeader();
 };
 
-QT_BEGIN_NAMESPACE
-
-namespace QTest {
-    template<>
-    char *toString(const QNetworkCookie &cookie)
-    {
-        return qstrdup(cookie.toRawForm());
-    }
-
-    template<>
-    char *toString(const QList<QNetworkCookie> &list)
-    {
-        QByteArray result = "QList(";
-        bool first = true;
-        foreach (QNetworkCookie cookie, list) {
-            if (!first)
-                result += ", ";
-            first = false;
-            result += "QNetworkCookie(" + cookie.toRawForm() + ')';
-        }
-        result.append(')');
-        return qstrdup(result.constData());
-    }
-}
-
-QT_END_NAMESPACE
-
 void tst_QNetworkRequest::ctor_data()
 {
     QTest::addColumn<QUrl>("url");
diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro
index ec74748f5b..175f361071 100644
--- a/tests/auto/network/ssl/ssl.pro
+++ b/tests/auto/network/ssl/ssl.pro
@@ -8,7 +8,7 @@ SUBDIRS=\
    qsslerror \
    qsslkey \
 
-qtConfig(ssl)|qtConfig(openssl)|qtConfig(openssl-linked) {
+qtConfig(ssl) {
     qtConfig(private_tests) {
         SUBDIRS += \
             qsslsocket \
@@ -21,7 +21,7 @@ winrt: SUBDIRS -= \
    qsslsocket_onDemandCertificates_member \
    qsslsocket_onDemandCertificates_static \
 
-qtConfig(ssl)|qtConfig(openssl)|qtConfig(openssl-linked) {
+qtConfig(ssl) {
     qtConfig(private_tests) {
         SUBDIRS += qasn1element \
                    qssldiffiehellmanparameters