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

 Conflicts:
	src/corelib/tools/qhash.h
	src/gui/kernel/qevent.h
	src/widgets/kernel/qshortcut.cpp
	src/widgets/kernel/qshortcut.h

Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620

3 files changed, 17 insertions, 14 deletions

diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index b8ae95dd93..16a30af892 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -499,7 +499,7 @@ void tst_QFile::initTestCase()
     file.write("b", 1);
     file.close();
 #ifndef Q_OS_WIN // Not supported on Windows.
-    QVERIFY2(file.setPermissions(0), qPrintable(file.errorString()));
+    QVERIFY2(file.setPermissions({ }), qPrintable(file.errorString()));
 #else
     QVERIFY2(file.open(QFile::WriteOnly), msgOpenFailed(file).constData());
 #endif
@@ -2211,7 +2211,7 @@ public:
     QStringList entryList(QDir::Filters, const QStringList &) const { return QStringList(); }
     bool caseSensitive() const { return false; }
     bool isRelativePath() const { return false; }
-    FileFlags fileFlags(FileFlags) const { return 0; }
+    FileFlags fileFlags(FileFlags) const { return { }; }
     bool chmod(uint) { return false; }
     QString fileName(FileName) const { return name; }
     uint ownerId(FileOwner) const { return 0; }
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index 744e047c45..ebb9a0a44c 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -1813,19 +1813,22 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks()
     QVERIFY2(creationResult == ERROR_SUCCESS, qPrintable(errorMessage));
 
     QFileInfo fi(path);
-    const bool actualIsSymLink = fi.isSymbolicLink();
+    auto guard = qScopeGuard([&fi, this]() {
+        // Ensure that junctions, mountpoints are removed. If this fails, do not remove
+        // temporary directory to prevent it from trashing the system.
+        if (fi.isDir()) {
+            if (!QDir().rmdir(fi.filePath())) {
+                qWarning("Unable to remove NTFS junction '%ls', keeping '%ls'.",
+                         qUtf16Printable(fi.fileName()),
+                         qUtf16Printable(QDir::toNativeSeparators(m_dir.path())));
+                m_dir.setAutoRemove(false);
+            }
+        }
+    });
     const QString actualSymLinkTarget = isSymLink ? fi.symLinkTarget() : QString();
     const QString actualCanonicalFilePath = isSymLink ? fi.canonicalFilePath() : QString();
-    // Ensure that junctions, mountpoints are removed. If this fails, do not remove
-    // temporary directory to prevent it from trashing the system.
-    if (fi.isDir()) {
-        if (!QDir().rmdir(fi.filePath())) {
-            qWarning("Unable to remove NTFS junction '%s'', keeping '%s'.",
-                     qPrintable(fi.fileName()), qPrintable(QDir::toNativeSeparators(m_dir.path())));
-            m_dir.setAutoRemove(false);
-        }
-    }
-    QCOMPARE(actualIsSymLink, isSymLink);
+    QCOMPARE(fi.isJunction(), resource.type == NtfsTestResource::Junction);
+    QCOMPARE(fi.isSymbolicLink(), isSymLink);
     if (isSymLink) {
         QCOMPARE(actualSymLinkTarget, linkTarget);
         QCOMPARE(actualCanonicalFilePath, canonicalFilePath);
diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
index bcf6d6c32b..5c6e633749 100644
--- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
+++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
@@ -848,7 +848,7 @@ void tst_QUrlInternal::correctEncodedMistakes()
     QString dataTag = QTest::currentDataTag();
     QString output = dataTag;
 
-    if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), 0))
+    if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), { }))
         output += input;
     QCOMPARE(output, dataTag + expected);