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

 Conflicts:
	src/corelib/io/qstandardpaths_unix.cpp
	src/corelib/tools/qsharedpointer_impl.h
	tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp

Change-Id: Iae95c5778dc091058f16f6db76f04a0178a9e809

6 files changed, 91 insertions, 34 deletions

diff --git a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
index 56d924dcc6..dae4e66106 100644
--- a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
+++ b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
@@ -465,16 +465,6 @@ void tst_qstandardpaths::testRuntimeDirectory()
 #ifdef Q_XDG_PLATFORM
     const QString runtimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
     QVERIFY(!runtimeDir.isEmpty());
-
-    // Check that it can automatically fix permissions
-    QFile file(runtimeDir);
-    const QFile::Permissions wantedPerms = QFile::ReadUser | QFile::WriteUser | QFile::ExeUser;
-    const QFile::Permissions additionalPerms = QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner;
-    QCOMPARE(file.permissions(), wantedPerms | additionalPerms);
-    QVERIFY(file.setPermissions(wantedPerms | QFile::ExeGroup));
-    const QString runtimeDirAgain = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
-    QCOMPARE(runtimeDirAgain, runtimeDir);
-    QCOMPARE(QFile(runtimeDirAgain).permissions(), wantedPerms | additionalPerms);
 #endif
 }
 
@@ -516,11 +506,27 @@ void tst_qstandardpaths::testCustomRuntimeDirectory()
     const QString runtimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
     QVERIFY2(runtimeDir.isEmpty(), qPrintable(runtimeDir));
 
-    // When $XDG_RUNTIME_DIR points to a non-existing directory, QStandardPaths should warn (QTBUG-48771)
-    qputenv("XDG_RUNTIME_DIR", "does_not_exist");
-    QTest::ignoreMessage(QtWarningMsg, "QStandardPaths: XDG_RUNTIME_DIR points to non-existing path 'does_not_exist', please create it with 0700 permissions.");
+    // When $XDG_RUNTIME_DIR points to a directory with wrong permissions, QStandardPaths should warn
+    const QByteArray wrongPermissionFileName = "wrong_permissions";
+    QDir::current().mkdir(wrongPermissionFileName);
+    QFile wrongPermissionFile(wrongPermissionFileName);
+    const QFile::Permissions wantedPerms = QFile::ReadUser | QFile::WriteUser | QFile::ExeUser;
+    QVERIFY(wrongPermissionFile.setPermissions(wantedPerms | QFile::ExeGroup));
+
+    qputenv("XDG_RUNTIME_DIR", wrongPermissionFileName);
+    QTest::ignoreMessage(QtWarningMsg,
+           qPrintable(QString::fromLatin1("QStandardPaths: wrong permissions on runtime directory " + wrongPermissionFileName + ", 7710 instead of 7700")));
+    const QString wrongPermissionRuntimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
+    QVERIFY(wrongPermissionRuntimeDir.isEmpty());
+    QDir::current().rmdir(wrongPermissionFileName);
+
+    // When $XDG_RUNTIME_DIR points to a non-existing directory, QStandardPaths should create it first
+    const QByteArray nonExistingDir = "does_not_exist";
+    qputenv("XDG_RUNTIME_DIR", nonExistingDir);
     const QString nonExistingRuntimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
-    QVERIFY2(nonExistingRuntimeDir.isEmpty(), qPrintable(nonExistingRuntimeDir));
+    QVERIFY2(!nonExistingRuntimeDir.compare(nonExistingDir), qPrintable(nonExistingRuntimeDir));
+    QVERIFY(QDir::current().exists(nonExistingRuntimeDir));
+    QDir::current().rmdir(nonExistingRuntimeDir);
 
     // When $XDG_RUNTIME_DIR points to a file, QStandardPaths should warn
     const QString file = QFINDTESTDATA("tst_qstandardpaths.cpp");
diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index f3c647515a..a9fd282ac9 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -40,6 +40,7 @@
 #include "nontracked.h"
 #include "wrapper.h"
 
+#include <array>
 #include <memory>
 #include <stdlib.h>
 #include <time.h>
@@ -106,12 +107,15 @@ private slots:
     void sharedFromThis();
 
     void constructorThrow();
+    void overloads();
 
     void threadStressTest_data();
     void threadStressTest();
     void validConstructs();
     void invalidConstructs_data();
     void invalidConstructs();
+
+
     // let invalidConstructs be the last test, because it's the slowest;
     // add new tests above this block
 public slots:
@@ -2383,6 +2387,11 @@ void tst_QSharedPointer::invalidConstructs_data()
     QTest::newRow("incompatible-custom-lambda-deleter")
         << &QTest::QExternalTest::tryCompileFail
         << "QSharedPointer<Data> ptr(new Data, [](int *) {});\n";
+
+    QTest::newRow("incompatible-overload")
+        << &QTest::QExternalTest::tryCompileFail
+        << "void foo(QSharedPointer<DerivedData>) {}\n"
+           "void bar() { foo(QSharedPointer<Data>()); }\n";
 }
 
 void tst_QSharedPointer::invalidConstructs()
@@ -2883,5 +2892,50 @@ void tst_QSharedPointer::reentrancyWhileDestructing()
     ReentrancyWhileDestructing::A obj;
 }
 
+namespace {
+struct Base1 {};
+struct Base2 {};
+
+struct Child1 : Base1 {};
+struct Child2 : Base2 {};
+
+template<template<typename> class SmartPtr>
+struct Overloaded
+{
+    std::array<int, 1> call(const SmartPtr<const Base1> &)
+    {
+        return {};
+    }
+    std::array<int, 2> call(const SmartPtr<const Base2> &)
+    {
+        return {};
+    }
+    static const Q_CONSTEXPR uint base1Called = sizeof(std::array<int, 1>);
+    static const Q_CONSTEXPR uint base2Called = sizeof(std::array<int, 2>);
+
+    void test()
+    {
+#define QVERIFY_CALLS(expr, base) Q_STATIC_ASSERT(sizeof(call(expr)) == base##Called)
+        QVERIFY_CALLS(SmartPtr<Base1>{}, base1);
+        QVERIFY_CALLS(SmartPtr<Base2>{}, base2);
+        QVERIFY_CALLS(SmartPtr<const Base1>{}, base1);
+        QVERIFY_CALLS(SmartPtr<const Base2>{}, base2);
+        QVERIFY_CALLS(SmartPtr<Child1>{}, base1);
+        QVERIFY_CALLS(SmartPtr<Child2>{}, base2);
+        QVERIFY_CALLS(SmartPtr<const Child1>{}, base1);
+        QVERIFY_CALLS(SmartPtr<const Child2>{}, base2);
+#undef QVERIFY_CALLS
+    }
+};
+}
+
+void tst_QSharedPointer::overloads()
+{
+    Overloaded<QSharedPointer> sharedOverloaded;
+    sharedOverloaded.test();
+    Overloaded<QWeakPointer> weakOverloaded;
+    weakOverloaded.test();
+}
+
 QTEST_MAIN(tst_QSharedPointer)
 #include "tst_qsharedpointer.moc"
diff --git a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
index 6a94eee389..4dfdf14e5b 100644
--- a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
+++ b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
@@ -1131,7 +1131,7 @@ void tst_QDtls::handshakeReadyRead()
     QUdpSocket *socket = qobject_cast<QUdpSocket *>(sender());
     Q_ASSERT(socket);
 
-    if (!socket->pendingDatagramSize())
+    if (socket->pendingDatagramSize() <= 0)
         return;
 
     const bool isServer = socket == &serverSocket;
diff --git a/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp b/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
index c90e9cb2c8..a273ceaa17 100644
--- a/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
+++ b/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
@@ -352,7 +352,7 @@ void tst_QDtlsCookie::receiveMessage(QUdpSocket *socket, QByteArray *message,
 {
     Q_ASSERT(socket && message);
 
-    if (!socket->pendingDatagramSize())
+    if (socket->pendingDatagramSize() <= 0)
         testLoop.enterLoopMSecs(handshakeTimeoutMS);
 
     QVERIFY(!testLoop.timeout());
@@ -377,7 +377,7 @@ void tst_QDtlsCookie::serverReadyRead()
 {
     Q_ASSERT(clientsToWait);
 
-    if (!serverSocket.pendingDatagramSize())
+    if (serverSocket.pendingDatagramSize() <= 0)
         return;
 
     QByteArray hello;
@@ -410,7 +410,7 @@ void tst_QDtlsCookie::clientReadyRead()
     QUdpSocket *clientSocket = qobject_cast<QUdpSocket *>(sender());
     Q_ASSERT(clientSocket);
 
-    if (!clientSocket->pendingDatagramSize())
+    if (clientSocket->pendingDatagramSize() <= 0)
         return;
 
     QDtls *handshake = nullptr;
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index 6c838995eb..c75767a513 100644
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
@@ -190,8 +190,7 @@ private slots:
 
     void task_250026_data() { generic_data("QODBC"); }
     void task_250026();
-    void task_205701_data() { generic_data("QMYSQL"); }
-    void task_205701();
+    void crashQueryOnCloseDatabase();
 
     void task_233829_data() { generic_data("QPSQL"); }
     void task_233829();
@@ -305,6 +304,8 @@ void tst_QSqlQuery::init()
 
 void tst_QSqlQuery::cleanup()
 {
+    if (QTest::currentTestFunction() == QLatin1String("crashQueryOnCloseDatabase"))
+        return;
     QFETCH( QString, dbName );
     QSqlDatabase db = QSqlDatabase::database( dbName );
     CHECK_DATABASE( db );
@@ -3442,19 +3443,17 @@ void tst_QSqlQuery::task_250026()
     QCOMPARE( q.value( 0 ).toString().length(), data1026.length() );
 }
 
-void tst_QSqlQuery::task_205701()
+void tst_QSqlQuery::crashQueryOnCloseDatabase()
 {
-    QSqlDatabase qsdb = QSqlDatabase::addDatabase("QMYSQL", "atest");
-    qsdb.setHostName("test");
-    qsdb.setDatabaseName("test");
-    qsdb.setUserName("test");
-    qsdb.setPassword("test");
-    qsdb.open();
-
-//     {
-        QSqlQuery query(qsdb);
-//     }
-    QSqlDatabase::removeDatabase("atest");
+    for (const auto &dbName : qAsConst(dbs.dbNames)) {
+        QSqlDatabase clonedDb = QSqlDatabase::cloneDatabase(
+              QSqlDatabase::database(dbName), "crashTest");
+        qDebug() << "Testing crash in sqlquery dtor for driver" << clonedDb.driverName();
+        QVERIFY(clonedDb.open());
+        QSqlQuery q(clonedDb);
+        clonedDb.close();
+        QSqlDatabase::removeDatabase("crashTest");
+    }
 }
 
 void tst_QSqlQuery::task_233829()
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 950f3ef670..4d24814724 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -3738,8 +3738,6 @@ void tst_QGraphicsScene::changedSignal()
     QCoreApplication::processEvents();
     QCOMPARE(cl.changes.size(), 2);
     QCOMPARE(cl.changes.at(1).size(), 2);
-    QCOMPARE(cl.changes.at(1).first(), QRectF(0, 0, 10, 10));
-    QCOMPARE(cl.changes.at(1).last(), QRectF(20, 0, 10, 10));
 
     QCOMPARE(scene.sceneRect(), QRectF(0, 0, 30, 10));
 }