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

 Conflicts:
	.qmake.conf
	src/network/ssl/qsslsocket_openssl.cpp

Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: Ibb57a0548b4977797b400637487a56245ac1c024

9 files changed, 47 insertions, 41 deletions

diff --git a/tests/auto/corelib/global/qglobal/qglobal.pro b/tests/auto/corelib/global/qglobal/qglobal.pro
index b105769430..e4453affa5 100644
--- a/tests/auto/corelib/global/qglobal/qglobal.pro
+++ b/tests/auto/corelib/global/qglobal/qglobal.pro
@@ -2,4 +2,6 @@ CONFIG += testcase
 TARGET = tst_qglobal
 QT = core testlib
 SOURCES = tst_qglobal.cpp qglobal.c
-contains(QT_CONFIG, c++1z): CONFIG += c++1z
+qtConfig(c++11): CONFIG += c++11
+qtConfig(c++14): CONFIG += c++14
+qtConfig(c++1z): CONFIG += c++1z
diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
index 5e5492de59..b33dec8a61 100644
--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -464,7 +464,7 @@ typedef int (Empty::*memFun) ();
         QCOMPARE(Q_ALIGNOF(type), size_t(alignment)); \
         /* Compare to native operator for compilers that support it,
            otherwise...  erm... check consistency! :-) */ \
-        QCOMPARE(QT_EMULATED_ALIGNOF(type), Q_ALIGNOF(type)); \
+        QCOMPARE(alignof(type), Q_ALIGNOF(type)); \
     } while (false)
     /**/
 
@@ -517,7 +517,7 @@ void tst_QGlobal::qAlignOf()
     TEST_AlignOf_impl(AlignmentInStruct<double>, Q_ALIGNOF(AlignmentInStruct<qint64>));
 
     // 32-bit x86 ABI, Clang disagrees with gcc
-#if !defined(Q_PROCESSOR_X86_32) || !defined(Q_CC_CLANG)
+#if !defined(Q_PROCESSOR_X86_32) || !defined(Q_CC_CLANG) || defined(Q_OS_ANDROID)
     TEST_AlignOf_impl(qint64 [5],       Q_ALIGNOF(qint64));
 #else
     TEST_AlignOf_impl(qint64 [5],       Q_ALIGNOF(AlignmentInStruct<qint64>));
diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
index 67d8c55b04..00417fffa0 100644
--- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
+++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
@@ -569,13 +569,7 @@ void tst_QTemporaryFile::rename()
 
 void tst_QTemporaryFile::renameFdLeak()
 {
-#ifdef Q_OS_UNIX
-
-#  if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
-    ChdirOnReturn cor(QDir::currentPath());
-    QDir::setCurrent(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
-#  endif
-
+#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID)
     const QByteArray sourceFile = QFile::encodeName(QFINDTESTDATA(__FILE__));
     QVERIFY(!sourceFile.isEmpty());
     // Test this on Unix only
diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
index a290c012df..aa85a7c35b 100644
--- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
+++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
@@ -41,7 +41,6 @@ class tst_QPlugin : public QObject
     Q_OBJECT
 
     QDir dir;
-    QString invalidPluginName;
 
 public:
     tst_QPlugin();
@@ -64,15 +63,14 @@ void tst_QPlugin::initTestCase()
     QVERIFY2(dir.exists(),
              qPrintable(QString::fromLatin1("Cannot find the 'plugins' directory starting from '%1'").
                         arg(QDir::toNativeSeparators(QDir::currentPath()))));
-
-    const auto fileNames = dir.entryList({"*invalid*"}, QDir::Files);
-    if (!fileNames.isEmpty())
-        invalidPluginName = dir.absoluteFilePath(fileNames.first());
 }
 
 void tst_QPlugin::loadDebugPlugin()
 {
     const auto fileNames = dir.entryList(QStringList() << "*debug*", QDir::Files);
+    if (fileNames.isEmpty())
+        QSKIP("No debug plugins found - skipping test");
+
     for (const QString &fileName : fileNames) {
         if (!QLibrary::isLibrary(fileName))
             continue;
@@ -100,6 +98,9 @@ void tst_QPlugin::loadDebugPlugin()
 void tst_QPlugin::loadReleasePlugin()
 {
     const auto fileNames = dir.entryList(QStringList() << "*release*", QDir::Files);
+    if (fileNames.isEmpty())
+        QSKIP("No release plugins found - skipping test");
+
     for (const QString &fileName : fileNames) {
         if (!QLibrary::isLibrary(fileName))
             continue;
@@ -227,7 +228,13 @@ static qsizetype locateMetadata(const uchar *data, qsizetype len)
 
 void tst_QPlugin::scanInvalidPlugin()
 {
-    QVERIFY(!invalidPluginName.isEmpty());
+    const auto fileNames = dir.entryList({"*invalid*"}, QDir::Files);
+    QString invalidPluginName;
+    if (fileNames.isEmpty())
+        QSKIP("No invalid plugin found - skipping test");
+    else
+        invalidPluginName = dir.absoluteFilePath(fileNames.first());
+
 
     // copy the file
     QFileInfo fn(invalidPluginName);
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
index 6f0aebb071..c5377379ea 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
@@ -2489,17 +2489,20 @@ void tst_QDateTime::fromString_LOCALE_ILDATE()
 
 void tst_QDateTime::fromStringToStringLocale_data()
 {
+    QTest::addColumn<QLocale>("locale");
     QTest::addColumn<QDateTime>("dateTime");
 
-    QTest::newRow("data0") << QDateTime(QDate(1999, 1, 18), QTime(11, 49, 00));
+    QTest::newRow("frFR") << QLocale(QLocale::French, QLocale::France) << QDateTime(QDate(1999, 1, 18), QTime(11, 49, 00));
+    QTest::newRow("spCO") << QLocale(QLocale::Spanish, QLocale::Colombia) << QDateTime(QDate(1999, 1, 18), QTime(11, 49, 00));
 }
 
 void tst_QDateTime::fromStringToStringLocale()
 {
+    QFETCH(QLocale, locale);
     QFETCH(QDateTime, dateTime);
 
     QLocale def;
-    QLocale::setDefault(QLocale(QLocale::French, QLocale::France));
+    QLocale::setDefault(locale);
 #define ROUNDTRIP(format) \
     QCOMPARE(QDateTime::fromString(dateTime.toString(format), format), dateTime)
 
diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index 5467d438a3..5701335b4a 100644
--- a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -539,6 +539,13 @@ void tst_QTextBoundaryFinder::sentenceBoundaries_manual_data()
 
         QTest::newRow("data3") << testString << expectedBreakPositions;
     }
+    {
+        QString testString(QString::fromUtf8("Doing TEST, doing another test."));
+        QList<int> expectedBreakPositions;
+        expectedBreakPositions << 0 << 31;
+
+        QTest::newRow("data4") << testString << expectedBreakPositions;
+    }
 }
 
 void tst_QTextBoundaryFinder::sentenceBoundaries_manual()
diff --git a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
index 69c961c1a1..c90348e91a 100644
--- a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
+++ b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
@@ -189,6 +189,10 @@ void tst_QPainterPath::reserveAndCapacity()
 
     p.reserve(0);
     QVERIFY(p.capacity() >= 1000);
+
+    QPainterPath p2;
+    p2.reserve(10);
+    QVERIFY(p.capacity() >= 10);
 }
 
 Q_DECLARE_METATYPE(QPainterPath)
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index a07181c199..e4ee778f64 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -864,6 +864,18 @@ void tst_QTextDocument::toHtml_data()
     {
         CREATE_DOC_AND_CURSOR();
 
+        QTextCharFormat fmt;
+        fmt.setFontFamily("Times");
+        fmt.setFontFamilies(QStringList{ "Times", "serif" });
+        cursor.insertText("Blah", fmt);
+
+        QTest::newRow("font-family-with-fallback") << QTextDocumentFragment(&doc)
+                                  << QString("<p DEFAULTBLOCKSTYLE><span style=\" font-family:'Times','serif';\">Blah</span></p>");
+    }
+
+    {
+        CREATE_DOC_AND_CURSOR();
+
         QTextBlockFormat fmt;
         fmt.setNonBreakableLines(true);
         cursor.insertBlock(fmt);
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index e85147095c..1afd8af7b0 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -5039,9 +5039,6 @@ public:
 // very similar to ioPostToHttpUploadProgress but for SSL
 void tst_QNetworkReply::ioPostToHttpsUploadProgress()
 {
-#ifdef Q_OS_WIN
-    QSKIP("QTBUG-76157: get rid of locking in TLS handshake (QSslSocket)");
-#endif
     //QFile sourceFile(testDataDir + "/bigfile");
     //QVERIFY(sourceFile.open(QIODevice::ReadOnly));
     qint64 wantedSize = 2*1024*1024; // 2 MB
@@ -6423,10 +6420,6 @@ void tst_QNetworkReply::encrypted()
 
 void tst_QNetworkReply::abortOnEncrypted()
 {
-#ifdef Q_OS_WIN
-    QSKIP("QTBUG-76157: get rid of locking in TLS handshake (QSslSocket)");
-#endif
-
     SslServer server;
     server.listen();
     if (!server.isListening())
@@ -8507,9 +8500,7 @@ void tst_QNetworkReply::ioHttpRedirectErrors_data()
 
     QTest::newRow("too-many-redirects") << "http://localhost" << tempRedirectReply << QNetworkReply::TooManyRedirectsError;
 #if QT_CONFIG(ssl)
-#ifndef Q_OS_WIN // QTBUG-76157
     QTest::newRow("insecure-redirect") << "https://localhost" << tempRedirectReply << QNetworkReply::InsecureRedirectError;
-#endif // Q_OS_WIN
 #endif
     QTest::newRow("unknown-redirect") << "http://localhost"<< tempRedirectReply.replace("http", "bad_protocol") << QNetworkReply::ProtocolUnknownError;
 }
@@ -8586,11 +8577,9 @@ void tst_QNetworkReply::ioHttpRedirectPolicy_data()
     QTest::newRow("nolesssafe-nossl") << QNetworkRequest::NoLessSafeRedirectPolicy << false << 1 << 200;
     QTest::newRow("same-origin-nossl") << QNetworkRequest::SameOriginRedirectPolicy << false << 1 << 200;
 #if QT_CONFIG(ssl)
-#ifndef Q_OS_WIN // QTBUG-76157
     QTest::newRow("manual-ssl") << QNetworkRequest::ManualRedirectPolicy << true << 0 << 307;
     QTest::newRow("nolesssafe-ssl") << QNetworkRequest::NoLessSafeRedirectPolicy << true << 1 << 200;
     QTest::newRow("same-origin-ssl") << QNetworkRequest::SameOriginRedirectPolicy << true << 1 << 200;
-#endif // Q_OS_WIN
 #endif
 }
 
@@ -8644,41 +8633,33 @@ void tst_QNetworkReply::ioHttpRedirectPolicyErrors_data()
     QTest::newRow("nolesssafe-nossl-nossl-too-many") << QNetworkRequest::NoLessSafeRedirectPolicy
             << false << QString("http://localhost:%1") << 0 << QNetworkReply::TooManyRedirectsError;
 #if QT_CONFIG(ssl)
-#ifndef Q_OS_WIN // QTBUG-76157
     QTest::newRow("nolesssafe-ssl-ssl-too-many") << QNetworkRequest::NoLessSafeRedirectPolicy
             << true << QString("https:/localhost:%1") << 0 << QNetworkReply::TooManyRedirectsError;
     QTest::newRow("nolesssafe-ssl-nossl-insecure-redirect") << QNetworkRequest::NoLessSafeRedirectPolicy
             << true << QString("http://localhost:%1") << 50 << QNetworkReply::InsecureRedirectError;
-#endif // Q_OS_WIN
 #endif
     // 2. SameOriginRedirectsPolicy
     QTest::newRow("same-origin-nossl-nossl-too-many") << QNetworkRequest::SameOriginRedirectPolicy
             << false << QString("http://localhost:%1") << 0 << QNetworkReply::TooManyRedirectsError;
 #if QT_CONFIG(ssl)
-#ifndef Q_OS_WIN // QTBUG-76157
     QTest::newRow("same-origin-ssl-ssl-too-many") << QNetworkRequest::SameOriginRedirectPolicy
             << true << QString("https://localhost:%1") << 0 << QNetworkReply::TooManyRedirectsError;
     QTest::newRow("same-origin-https-http-wrong-protocol") << QNetworkRequest::SameOriginRedirectPolicy
             << true << QString("http://localhost:%1") << 50 << QNetworkReply::InsecureRedirectError;
-#endif // Q_OS_WIN
 #endif
     QTest::newRow("same-origin-http-https-wrong-protocol") << QNetworkRequest::SameOriginRedirectPolicy
             << false << QString("https://localhost:%1") << 50 << QNetworkReply::InsecureRedirectError;
     QTest::newRow("same-origin-http-http-wrong-host") << QNetworkRequest::SameOriginRedirectPolicy
             << false << QString("http://not-so-localhost:%1") << 50 << QNetworkReply::InsecureRedirectError;
 #if QT_CONFIG(ssl)
-#ifndef Q_OS_WIN // QTBUG-76157
     QTest::newRow("same-origin-https-https-wrong-host") << QNetworkRequest::SameOriginRedirectPolicy
             << true << QString("https://not-so-localhost:%1") << 50 << QNetworkReply::InsecureRedirectError;
-#endif // Q_OS_WIN
 #endif
     QTest::newRow("same-origin-http-http-wrong-port") << QNetworkRequest::SameOriginRedirectPolicy
             << false << QString("http://localhost/%1") << 50 << QNetworkReply::InsecureRedirectError;
 #if QT_CONFIG(ssl)
-#ifndef Q_OS_WIN // QTBUG-76157
     QTest::newRow("same-origin-https-https-wrong-port") << QNetworkRequest::SameOriginRedirectPolicy
             << true << QString("https://localhost/%1") << 50 << QNetworkReply::InsecureRedirectError;
-#endif // Q_OS_WIN
 #endif
 }
 
@@ -9153,10 +9134,6 @@ void tst_QNetworkReply::putWithServerClosingConnectionImmediately()
 
     for (int s = 0; s <= 1; s++) {
         withSsl = (s == 1);
-#ifdef Q_OS_WIN
-        if (withSsl)
-            QSKIP("QTBUG-76157: get rid of locking in TLS handshake (QSslSocket)");
-#endif // Q_OS_WIN
         // Test also needs to run several times because of 9c2ecf89
         for (int j = 0; j < 20; j++) {
             // emulate a minimal https server