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

6 files changed, 31 insertions, 18 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()