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

Conflicts:
	src/concurrent/doc/qtconcurrent.qdocconf
	src/corelib/doc/qtcore.qdocconf
	src/corelib/global/qglobal.h
	src/dbus/doc/qtdbus.qdocconf
	src/dbus/qdbusmessage.h
	src/gui/doc/qtgui.qdocconf
	src/gui/image/qimagereader.cpp
	src/network/doc/qtnetwork.qdocconf
	src/opengl/doc/qtopengl.qdocconf
	src/opengl/qgl.h
	src/plugins/platforms/windows/qwindowswindow.cpp
	src/printsupport/doc/qtprintsupport.qdocconf
	src/sql/doc/qtsql.qdocconf
	src/testlib/doc/qttestlib.qdocconf
	src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
	src/widgets/doc/qtwidgets.qdocconf
	src/xml/doc/qtxml.qdocconf

Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629

9 files changed, 128 insertions, 81 deletions

diff --git a/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
index 469a6a6c89..ad6420da17 100644
--- a/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
+++ b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
@@ -256,17 +256,17 @@ void tst_QNetworkCookie::parseSingleCookie_data()
     QTest::newRow("path-with-utf8-2") << "a=b;path=/R%C3%A9sum%C3%A9" << cookie;
 
     cookie.setPath(QString());
-    cookie.setDomain("qt.nokia.com");
-    QTest::newRow("plain-domain1") << "a=b;domain=qt.nokia.com" << cookie;
-    QTest::newRow("plain-domain2") << "a=b; domain=qt.nokia.com " << cookie;
-    QTest::newRow("plain-domain3") << "a=b;domain=QT.NOKIA.COM" << cookie;
-    QTest::newRow("plain-domain4") << "a=b;DOMAIN = QT.NOKIA.COM" << cookie;
-
-    cookie.setDomain(".qt.nokia.com");
-    QTest::newRow("dot-domain1") << "a=b;domain=.qt.nokia.com" << cookie;
-    QTest::newRow("dot-domain2") << "a=b; domain=.qt.nokia.com" << cookie;
-    QTest::newRow("dot-domain3") << "a=b; domain=.QT.NOKIA.COM" << cookie;
-    QTest::newRow("dot-domain4") << "a=b; Domain = .QT.NOKIA.COM" << cookie;
+    cookie.setDomain("qt-project.org");
+    QTest::newRow("plain-domain1") << "a=b;domain=qt-project.org" << cookie;
+    QTest::newRow("plain-domain2") << "a=b; domain=qt-project.org " << cookie;
+    QTest::newRow("plain-domain3") << "a=b;domain=QT-PROJECT.ORG" << cookie;
+    QTest::newRow("plain-domain4") << "a=b;DOMAIN = QT-PROJECT.ORG" << cookie;
+
+    cookie.setDomain(".qt-project.org");
+    QTest::newRow("dot-domain1") << "a=b;domain=.qt-project.org" << cookie;
+    QTest::newRow("dot-domain2") << "a=b; domain=.qt-project.org" << cookie;
+    QTest::newRow("dot-domain3") << "a=b; domain=.QT-PROJECT.ORG" << cookie;
+    QTest::newRow("dot-domain4") << "a=b; Domain = .QT-PROJECT.ORG" << cookie;
 
     cookie.setDomain(QString::fromUtf8(".d\303\270gn\303\245pent.troll.no"));
     QTest::newRow("idn-domain1") << "a=b;domain=.xn--dgnpent-gxa2o.troll.no" << cookie;
@@ -274,20 +274,20 @@ void tst_QNetworkCookie::parseSingleCookie_data()
     QTest::newRow("idn-domain3") << "a=b;domain=.XN--DGNPENT-GXA2O.TROLL.NO" << cookie;
     QTest::newRow("idn-domain4") << QString::fromUtf8("a=b;domain=.D\303\230GN\303\205PENT.troll.NO") << cookie;
 
-    cookie.setDomain(".qt.nokia.com");
+    cookie.setDomain(".qt-project.org");
     cookie.setPath("/");
-    QTest::newRow("two-fields") << "a=b;domain=.qt.nokia.com;path=/" << cookie;
-    QTest::newRow("two-fields2") << "a=b; domain=.qt.nokia.com; path=/" << cookie;
-    QTest::newRow("two-fields3") << "a=b;   domain=.qt.nokia.com ; path=/ " << cookie;
-    QTest::newRow("two-fields4") << "a=b;path=/; domain=.qt.nokia.com" << cookie;
-    QTest::newRow("two-fields5") << "a=b; path=/  ;   domain=.qt.nokia.com" << cookie;
-    QTest::newRow("two-fields6") << "a=b; path= /  ;   domain =.qt.nokia.com" << cookie;
+    QTest::newRow("two-fields") << "a=b;domain=.qt-project.org;path=/" << cookie;
+    QTest::newRow("two-fields2") << "a=b; domain=.qt-project.org; path=/" << cookie;
+    QTest::newRow("two-fields3") << "a=b;   domain=.qt-project.org ; path=/ " << cookie;
+    QTest::newRow("two-fields4") << "a=b;path=/; domain=.qt-project.org" << cookie;
+    QTest::newRow("two-fields5") << "a=b; path=/  ;   domain=.qt-project.org" << cookie;
+    QTest::newRow("two-fields6") << "a=b; path= /  ;   domain =.qt-project.org" << cookie;
 
     cookie.setSecure(true);
-    QTest::newRow("three-fields") << "a=b;domain=.qt.nokia.com;path=/;secure" << cookie;
-    QTest::newRow("three-fields2") << "a=b;secure;path=/;domain=.qt.nokia.com" << cookie;
-    QTest::newRow("three-fields3") << "a=b;secure;domain=.qt.nokia.com; path=/" << cookie;
-    QTest::newRow("three-fields4") << "a = b;secure;domain=.qt.nokia.com; path=/" << cookie;
+    QTest::newRow("three-fields") << "a=b;domain=.qt-project.org;path=/;secure" << cookie;
+    QTest::newRow("three-fields2") << "a=b;secure;path=/;domain=.qt-project.org" << cookie;
+    QTest::newRow("three-fields3") << "a=b;secure;domain=.qt-project.org; path=/" << cookie;
+    QTest::newRow("three-fields4") << "a = b;secure;domain=.qt-project.org; path=/" << cookie;
 
     cookie = QNetworkCookie();
     cookie.setName("a");
@@ -468,7 +468,7 @@ void tst_QNetworkCookie::parseSingleCookie_data()
     cookie.setExpirationDate(QDateTime(QDate(2010, 2, 3), QTime(0, 0), Qt::UTC));
     QTest::newRow("ambiguousd-2") << "a=b;expires=2/3/10 0:0" << cookie;
 
-    // FYI If you try these in Firefox it wont set a cookie for the following two string
+    // FYI If you try these in Firefox it won't set a cookie for the following two string
     // because 03 is turned into the year at which point it is expired
     cookie.setExpirationDate(QDateTime(QDate(2003, 2, 10), QTime(0, 0), Qt::UTC));
     QTest::newRow("ambiguousd-3") << "a=b;expires=2/10/3 0:0" << cookie;
@@ -575,9 +575,9 @@ void tst_QNetworkCookie::parseSingleCookie_data()
     QTest::newRow("expires+path") << "a=b; expires=Wed, 09-Nov-1999 23:12:40 GMT; path=/" << cookie;
     QTest::newRow("path+expires") << "a=b; path=/;expires=Wed, 09-Nov-1999 23:12:40 GMT " << cookie;
 
-    cookie.setDomain(".qt.nokia.com");
-    QTest::newRow("full") << "a=b; domain=.qt.nokia.com;expires=Wed, 09-Nov-1999 23:12:40 GMT;path=/" << cookie;
-    QTest::newRow("full2") << "a=b;path=/; expires=Wed, 09-Nov-1999 23:12:40 GMT ;domain=.qt.nokia.com" << cookie;
+    cookie.setDomain(".qt-project.org");
+    QTest::newRow("full") << "a=b; domain=.qt-project.org;expires=Wed, 09-Nov-1999 23:12:40 GMT;path=/" << cookie;
+    QTest::newRow("full2") << "a=b;path=/; expires=Wed, 09-Nov-1999 23:12:40 GMT ;domain=.qt-project.org" << cookie;
 
     // cookies obtained from the network:
     cookie = QNetworkCookie("__siteid", "1");
diff --git a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 821c633179..4ee4b67ec0 100644
--- a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -275,74 +275,74 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
     QNetworkCookie cookie;
     cookie.setName("a");
     cookie.setPath("/web");
-    cookie.setDomain(".nokia.com");
+    cookie.setDomain(".qt-project.org");
     allCookies += cookie;
 
     QTest::newRow("no-match-1") << allCookies << "http://foo.bar/" << result;
     QTest::newRow("no-match-2") << allCookies << "http://foo.bar/web" << result;
     QTest::newRow("no-match-3") << allCookies << "http://foo.bar/web/wiki" << result;
-    QTest::newRow("no-match-4") << allCookies << "http://nokia.com" << result;
-    QTest::newRow("no-match-5") << allCookies << "http://qt.nokia.com" << result;
-    QTest::newRow("no-match-6") << allCookies << "http://nokia.com/webinar" << result;
-    QTest::newRow("no-match-7") << allCookies << "http://qt.nokia.com/webinar" << result;
-    QTest::newRow("no-match-8") << allCookies << "http://qt.nokia.com./web" << result;
-    QTest::newRow("no-match-9") << allCookies << "http://nokia.com./web" << result;
+    QTest::newRow("no-match-4") << allCookies << "http://qt-project.org" << result;
+    QTest::newRow("no-match-5") << allCookies << "http://qt-project.org" << result;
+    QTest::newRow("no-match-6") << allCookies << "http://qt-project.org/webinar" << result;
+    QTest::newRow("no-match-7") << allCookies << "http://qt-project.org/webinar" << result;
+    QTest::newRow("no-match-8") << allCookies << "http://qt-project.org./web" << result;
+    QTest::newRow("no-match-9") << allCookies << "http://qt-project.org./web" << result;
 
     result = allCookies;
-    QTest::newRow("match-1") << allCookies << "http://nokia.com/web" << result;
-    QTest::newRow("match-2") << allCookies << "http://nokia.com/web/" << result;
-    QTest::newRow("match-3") << allCookies << "http://nokia.com/web/content" << result;
-    QTest::newRow("match-4") << allCookies << "http://qt.nokia.com/web" << result;
-    QTest::newRow("match-5") << allCookies << "http://qt.nokia.com/web/" << result;
-    QTest::newRow("match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
+    QTest::newRow("match-1") << allCookies << "http://qt-project.org/web" << result;
+    QTest::newRow("match-2") << allCookies << "http://qt-project.org/web/" << result;
+    QTest::newRow("match-3") << allCookies << "http://qt-project.org/web/content" << result;
+    QTest::newRow("match-4") << allCookies << "http://qt-project.org/web" << result;
+    QTest::newRow("match-5") << allCookies << "http://qt-project.org/web/" << result;
+    QTest::newRow("match-6") << allCookies << "http://qt-project.org/web/content" << result;
 
     cookie.setPath("/web/wiki");
     allCookies += cookie;
 
     // exact same results as before:
-    QTest::newRow("one-match-1") << allCookies << "http://nokia.com/web" << result;
-    QTest::newRow("one-match-2") << allCookies << "http://nokia.com/web/" << result;
-    QTest::newRow("one-match-3") << allCookies << "http://nokia.com/web/content" << result;
-    QTest::newRow("one-match-4") << allCookies << "http://qt.nokia.com/web" << result;
-    QTest::newRow("one-match-5") << allCookies << "http://qt.nokia.com/web/" << result;
-    QTest::newRow("one-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
+    QTest::newRow("one-match-1") << allCookies << "http://qt-project.org/web" << result;
+    QTest::newRow("one-match-2") << allCookies << "http://qt-project.org/web/" << result;
+    QTest::newRow("one-match-3") << allCookies << "http://qt-project.org/web/content" << result;
+    QTest::newRow("one-match-4") << allCookies << "http://qt-project.org/web" << result;
+    QTest::newRow("one-match-5") << allCookies << "http://qt-project.org/web/" << result;
+    QTest::newRow("one-match-6") << allCookies << "http://qt-project.org/web/content" << result;
 
     result.prepend(cookie);     // longer path, it must match first
-    QTest::newRow("two-matches-1") << allCookies << "http://nokia.com/web/wiki" << result;
-    QTest::newRow("two-matches-2") << allCookies << "http://qt.nokia.com/web/wiki" << result;
+    QTest::newRow("two-matches-1") << allCookies << "http://qt-project.org/web/wiki" << result;
+    QTest::newRow("two-matches-2") << allCookies << "http://qt-project.org/web/wiki" << result;
 
     // invert the order;
     allCookies.clear();
     allCookies << result.at(1) << result.at(0);
-    QTest::newRow("two-matches-3") << allCookies << "http://nokia.com/web/wiki" << result;
-    QTest::newRow("two-matches-4") << allCookies << "http://qt.nokia.com/web/wiki" << result;
+    QTest::newRow("two-matches-3") << allCookies << "http://qt-project.org/web/wiki" << result;
+    QTest::newRow("two-matches-4") << allCookies << "http://qt-project.org/web/wiki" << result;
 
     // expired cookie
     allCookies.clear();
     cookie.setExpirationDate(QDateTime::fromString("09-Nov-1999", "dd-MMM-yyyy"));
     allCookies += cookie;
     result.clear();
-    QTest::newRow("exp-match-1") << allCookies << "http://nokia.com/web" << result;
-    QTest::newRow("exp-match-2") << allCookies << "http://nokia.com/web/" << result;
-    QTest::newRow("exp-match-3") << allCookies << "http://nokia.com/web/content" << result;
-    QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web" << result;
-    QTest::newRow("exp-match-5") << allCookies << "http://qt.nokia.com/web/" << result;
-    QTest::newRow("exp-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
+    QTest::newRow("exp-match-1") << allCookies << "http://qt-project.org/web" << result;
+    QTest::newRow("exp-match-2") << allCookies << "http://qt-project.org/web/" << result;
+    QTest::newRow("exp-match-3") << allCookies << "http://qt-project.org/web/content" << result;
+    QTest::newRow("exp-match-4") << allCookies << "http://qt-project.org/web" << result;
+    QTest::newRow("exp-match-5") << allCookies << "http://qt-project.org/web/" << result;
+    QTest::newRow("exp-match-6") << allCookies << "http://qt-project.org/web/content" << result;
 
     // path matching
     allCookies.clear();
     QNetworkCookie anotherCookie;
     anotherCookie.setName("a");
     anotherCookie.setPath("/web");
-    anotherCookie.setDomain(".nokia.com");
+    anotherCookie.setDomain(".qt-project.org");
     allCookies += anotherCookie;
     result.clear();
-    QTest::newRow("path-unmatch-1") << allCookies << "http://nokia.com/" << result;
-    QTest::newRow("path-unmatch-2") << allCookies << "http://nokia.com/something/else" << result;
+    QTest::newRow("path-unmatch-1") << allCookies << "http://qt-project.org/" << result;
+    QTest::newRow("path-unmatch-2") << allCookies << "http://qt-project.org/something/else" << result;
     result += anotherCookie;
-    QTest::newRow("path-match-1") << allCookies << "http://nokia.com/web" << result;
-    QTest::newRow("path-match-2") << allCookies << "http://nokia.com/web/" << result;
-    QTest::newRow("path-match-3") << allCookies << "http://nokia.com/web/content" << result;
+    QTest::newRow("path-match-1") << allCookies << "http://qt-project.org/web" << result;
+    QTest::newRow("path-match-2") << allCookies << "http://qt-project.org/web/" << result;
+    QTest::newRow("path-match-3") << allCookies << "http://qt-project.org/web/content" << result;
 
     // secure cookies
     allCookies.clear();
@@ -350,14 +350,14 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
     QNetworkCookie secureCookie;
     secureCookie.setName("a");
     secureCookie.setPath("/web");
-    secureCookie.setDomain(".nokia.com");
+    secureCookie.setDomain(".qt-project.org");
     secureCookie.setSecure(true);
     allCookies += secureCookie;
-    QTest::newRow("no-match-secure-1") << allCookies << "http://nokia.com/web" << result;
-    QTest::newRow("no-match-secure-2") << allCookies << "http://qt.nokia.com/web" << result;
+    QTest::newRow("no-match-secure-1") << allCookies << "http://qt-project.org/web" << result;
+    QTest::newRow("no-match-secure-2") << allCookies << "http://qt-project.org/web" << result;
     result += secureCookie;
-    QTest::newRow("match-secure-1") << allCookies << "https://nokia.com/web" << result;
-    QTest::newRow("match-secure-2") << allCookies << "https://qt.nokia.com/web" << result;
+    QTest::newRow("match-secure-1") << allCookies << "https://qt-project.org/web" << result;
+    QTest::newRow("match-secure-2") << allCookies << "https://qt-project.org/web" << result;
 
     // domain ending in .
     allCookies.clear();
diff --git a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
index de17511423..600a1770b7 100644
--- a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
+++ b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
@@ -102,7 +102,7 @@ void tst_QNetworkRequest::ctor_data()
 
     QTest::newRow("nothing") << QUrl();
     QTest::newRow("empty") << QUrl();
-    QTest::newRow("http") << QUrl("http://qt.nokia.com");
+    QTest::newRow("http") << QUrl("http://qt-project.org");
 }
 
 void tst_QNetworkRequest::ctor()
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index 5de8785fce..90e6797117 100644
--- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
@@ -273,7 +273,7 @@ void tst_QNetworkProxyFactory::fromConfigurations()
 {
     QNetworkConfigurationManager manager;
     QList<QNetworkProxy> proxies;
-    QUrl url(QLatin1String("http://qt.nokia.com"));
+    QUrl url(QLatin1String("http://qt-project.org"));
     //get from known configurations
     foreach (QNetworkConfiguration config, manager.allConfigurations()) {
         QNetworkProxyQuery query(config, url, QNetworkProxyQuery::UrlRequest);
@@ -320,7 +320,7 @@ void tst_QNetworkProxyFactory::inNetworkAccessManager_data()
     QNetworkConfigurationManager manager;
     //get from known configurations
     foreach (QNetworkConfiguration config, manager.allConfigurations()) {
-        QNetworkProxyQuery query(config, QUrl(QString("http://qt.nokia.com")), QNetworkProxyQuery::UrlRequest);
+        QNetworkProxyQuery query(config, QUrl(QString("http://qt-project.org")), QNetworkProxyQuery::UrlRequest);
         QList<QNetworkProxy> proxies = QNetworkProxyFactory::systemProxyForQuery(query);
         QTest::newRow(config.name().toUtf8()) << config << proxies;
     }
@@ -339,7 +339,7 @@ void tst_QNetworkProxyFactory::inNetworkAccessManager()
     manager.setConfiguration(config);
 
     //using an internet server, because cellular APs won't have a route to the test server.
-    QNetworkRequest req(QUrl(QString("http://qt.nokia.com")));
+    QNetworkRequest req(QUrl(QString("http://qt-project.org")));
     QNetworkReply *reply = manager.get(req);
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
     QTestEventLoop::instance().enterLoop(30);
@@ -383,7 +383,7 @@ public:
 //regression test for QTBUG-18799
 void tst_QNetworkProxyFactory::systemProxyForQueryCalledFromThread()
 {
-    QUrl url(QLatin1String("http://qt.nokia.com"));
+    QUrl url(QLatin1String("http://qt-project.org"));
     QNetworkProxyQuery query(url);
     QSPFQThread thread;
     thread.query = query;
diff --git a/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.1c b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.1c
new file mode 100644
index 0000000000..a45ed864f4
--- /dev/null
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.1c
@@ -0,0 +1,41 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 14905561440751715648 (0xcedb312845c40540)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd
+        Validity
+            Not Before: Aug  4 09:53:41 2010 GMT
+            Not After : Aug 29 09:53:41 2051 GMT
+        Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:cd:aa:db:6f:d6:34:c9:a7:f1:c0:be:e4:41:18:
+                    19:e2:02:c9:22:e6:a7:d5:ba:03:2e:9e:28:7a:f4:
+                    5f:1a:77:5f:77:a9:11:3b:8f:7e:f0:2e:c6:9e:eb:
+                    3a:d9:12:d7:c1:0c:51:e8:24:52:3f:23:c3:42:0c:
+                    11:c6:f2:1c:a1:42:fe:b4:c2:69:83:ad:f7:70:b1:
+                    18:15:cc:20:28:62:30:f0:2c:15:e6:33:19:af:c3:
+                    eb:1c:c0:91:f7:11:68:94:50:f8:49:37:08:32:d7:
+                    3e:75:df:a3:bc:69:00:15:de:cd:87:0f:5c:02:6b:
+                    82:c8:01:7d:6a:f0:1d:dc:73
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                8A:6E:19:E7:97:9B:8F:D9:7F:B3:BB:01:4F:E8:6A:2F:52:95:0D:D9
+            X509v3 Authority Key Identifier: 
+                keyid:8A:6E:19:E7:97:9B:8F:D9:7F:B3:BB:01:4F:E8:6A:2F:52:95:0D:D9
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+         a1:74:8e:5d:36:96:2c:05:7e:ea:66:cc:2e:68:c7:3d:93:dc:
+         8c:a3:11:ad:b5:7e:6e:d0:04:c4:09:bd:0a:f9:39:3b:97:d7:
+         f0:bb:0c:09:7b:83:fe:bf:87:b0:47:e8:94:b7:aa:9c:79:ad:
+         71:9e:b7:c4:99:98:6f:1d:38:32:f8:a3:75:38:c4:e5:e7:37:
+         37:21:ec:7b:50:8b:15:b0:97:1e:17:9c:50:17:3c:c1:df:94:
+         55:fb:60:2e:50:40:d1:ea:23:c6:3c:21:6f:97:8c:06:16:a5:
+         82:72:c1:63:14:64:86:eb:d7:ff:72:f6:09:f5:6d:e6:04:13:
+         7a:6a
diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
index 7ee87472a1..74c3f7833b 100644
--- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
@@ -538,7 +538,7 @@ void tst_QSslCertificate::fromPath_data()
     QTest::newRow("\"certificates/cert*\" wildcard pem") << QString("certificates/cert*") << int(QRegExp::Wildcard) << true << 4;
     QTest::newRow("\"certificates/cert-[sure]*\" wildcard pem") << QString("certificates/cert-[sure]*") << int(QRegExp::Wildcard) << true << 3;
     QTest::newRow("\"certificates/cert-[not]*\" wildcard pem") << QString("certificates/cert-[not]*") << int(QRegExp::Wildcard) << true << 0;
-    QTest::newRow("\"certificates/*\" wildcard der") << QString("certificates/*") << int(QRegExp::Wildcard) << false << 0;
+    QTest::newRow("\"certificates/*\" wildcard der") << QString("certificates/*") << int(QRegExp::Wildcard) << false << 2;
     QTest::newRow("\"c*/c*.pem\" fixed pem") << QString("c*/c*.pem") << int(QRegExp::FixedString) << true << 0;
     QTest::newRow("\"c*/c*.pem\" fixed der") << QString("c*/c*.pem") << int(QRegExp::FixedString) << false << 0;
     QTest::newRow("\"c*/c*.pem\" regexp pem") << QString("c*/c*.pem") << int(QRegExp::RegExp) << true << 0;
@@ -868,11 +868,16 @@ void tst_QSslCertificate::toText()
     QVERIFY(f101.open(QIODevice::ReadOnly | QFile::Text));
     QByteArray txt101 = f101.readAll();
 
+    QFile f101c(testDataDir + "/more-certificates/cert-large-expiration-date.txt.1.0.1c");
+    QVERIFY(f101c.open(QIODevice::ReadOnly | QFile::Text));
+    QByteArray txt101c = f101c.readAll();
+
     QString txtcert = cert.toText();
 
     QVERIFY(QString::fromLatin1(txt098) == txtcert ||
             QString::fromLatin1(txt100) == txtcert ||
-            QString::fromLatin1(txt101) == txtcert );
+            QString::fromLatin1(txt101) == txtcert ||
+            QString::fromLatin1(txt101c) == txtcert );
 }
 
 void tst_QSslCertificate::multipleCommonNames()
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index ba358822af..a2bb1ec705 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -1001,7 +1001,7 @@ void tst_QSslSocket::protocolServerSide_data()
     QTest::newRow("ssl3-tls1ssl3") << QSsl::SslV3 << QSsl::TlsV1SslV3 << true;
     QTest::newRow("ssl3-secure") << QSsl::SslV3 << QSsl::SecureProtocols << true;
 #ifndef OPENSSL_NO_SSL2
-    QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << false; // we wont set a SNI header here because we connect to a
+    QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << false; // we won't set a SNI header here because we connect to a
                                                                             // numerical IP, so OpenSSL will send a SSL 2 handshake
 #else
     QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << true;
@@ -1014,7 +1014,7 @@ void tst_QSslSocket::protocolServerSide_data()
     QTest::newRow("tls1-tls1ssl3") << QSsl::TlsV1_0 << QSsl::TlsV1SslV3 << true;
     QTest::newRow("tls1.0-secure") << QSsl::TlsV1_0 << QSsl::SecureProtocols << true;
 #ifndef OPENSSL_NO_SSL2
-    QTest::newRow("tls1.0-any") << QSsl::TlsV1_0 << QSsl::AnyProtocol << false; // we wont set a SNI header here because we connect to a
+    QTest::newRow("tls1.0-any") << QSsl::TlsV1_0 << QSsl::AnyProtocol << false; // we won't set a SNI header here because we connect to a
                                                                             // numerical IP, so OpenSSL will send a SSL 2 handshake
 #else
     QTest::newRow("tls1.0-any") << QSsl::TlsV1_0 << QSsl::AnyProtocol << true;
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
index eb04be10c8..a296723839 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
@@ -47,10 +47,11 @@
 #include <QAuthenticator>
 
 #ifdef QT_BUILD_INTERNAL
-#include "private/qhostinfo_p.h"
-#include "private/qsslsocket_p.h"
-#endif
-
+#  include "private/qhostinfo_p.h"
+#  ifndef QT_NO_OPENSSL
+#    include "private/qsslsocket_p.h"
+#  endif // !QT_NO_OPENSSL
+#endif // QT_BUILD_INTERNAL
 #include "../../../network-settings.h"
 
 #ifndef QT_NO_OPENSSL
@@ -192,7 +193,7 @@ void tst_QSslSocket_onDemandCertificates_member::proxyAuthenticationRequired(con
 
 void tst_QSslSocket_onDemandCertificates_member::onDemandRootCertLoadingMemberMethods()
 {
-    QString host("codereview.qt-project.org");
+    QString host("qt-project.org");
 
     // not using any root certs -> should not work
     QSslSocketPtr socket2 = newSocket();
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp
index dc447eca07..3372b3599d 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp
@@ -189,7 +189,7 @@ void tst_QSslSocket_onDemandCertificates_static::proxyAuthenticationRequired(con
 
 void tst_QSslSocket_onDemandCertificates_static::onDemandRootCertLoadingStaticMethods()
 {
-    QString host("codereview.qt-project.org");
+    QString host("qt-project.org");
 
     // not using any root certs -> should not work
     QSslSocket::setDefaultCaCertificates(QList<QSslCertificate>());