Merge remote-tracking branch 'origin/5.12' into 5.12.1

 Conflicts:
	src/widgets/kernel/qtooltip.cpp

Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8

3 files changed, 4 insertions, 3 deletions

diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index ae1869f89e..9d1ce51da5 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -96,7 +96,7 @@ class Q_CORE_EXPORT QDebug
         void setVerbosity(int v)
         {
             if (context.version > 1) {
-                flags &= ~(VerbosityMask << VerbosityShift);
+                flags &= ~(uint(VerbosityMask) << VerbosityShift);
                 flags |= (v & VerbosityMask) << VerbosityShift;
             }
         }
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 405718aba8..4b63a38963 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -2127,10 +2127,9 @@ QString QDir::rootPath()
 bool QDir::match(const QStringList &filters, const QString &fileName)
 {
     for (QStringList::ConstIterator sit = filters.constBegin(); sit != filters.constEnd(); ++sit) {
-        QString wildcard = QRegularExpression::wildcardToRegularExpression(*sit);
         // Insensitive exact match
         // (see Notes for QRegExp Users in QRegularExpression's documentation)
-        QRegularExpression rx(QRegularExpression::anchoredPattern(wildcard),
+        QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(*sit),
                               QRegularExpression::CaseInsensitiveOption);
         if (rx.match(fileName).hasMatch())
             return true;
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 26078a6c71..185e061d8f 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -703,6 +703,8 @@ bool QFileInfo::exists() const
 */
 bool QFileInfo::exists(const QString &file)
 {
+    if (file.isEmpty())
+        return false;
     QFileSystemEntry entry(file);
     QFileSystemMetaData data;
     QAbstractFileEngine *engine =