From 3eebadc1734463afa469dcd08eab8c5d2557dec6 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Fri, 28 Sep 2018 11:40:10 +0200
Subject: Modernize the "mimetype" feature

Change-Id: I9b67c2cbc0891a38ece18d521c86fbc7344dce7a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/corelib/mimetypes/qmimeglobpattern.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/corelib/mimetypes/qmimeglobpattern.cpp')

diff --git a/src/corelib/mimetypes/qmimeglobpattern.cpp b/src/corelib/mimetypes/qmimeglobpattern.cpp
index e7b2b879a1..cd42b4da83 100644
--- a/src/corelib/mimetypes/qmimeglobpattern.cpp
+++ b/src/corelib/mimetypes/qmimeglobpattern.cpp
@@ -39,8 +39,6 @@
 
 #include "qmimeglobpattern_p.h"
 
-#ifndef QT_NO_MIMETYPE
-
 #include <QRegExp>
 #include <QStringList>
 #include <QDebug>
@@ -239,5 +237,3 @@ void QMimeAllGlobPatterns::clear()
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_MIMETYPE
-- 
cgit v1.2.3


From 88d5eb13d7a996772f38e9c9ab90befb3ae0c80d Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 10 Dec 2018 15:03:51 +0100
Subject: Use QRegularExpression instead of QRegExp

Change-Id: I14abbf81a9d0fb72f75417da06b6456b8f1a20a2
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
---
 src/corelib/mimetypes/qmimeglobpattern.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/corelib/mimetypes/qmimeglobpattern.cpp')

diff --git a/src/corelib/mimetypes/qmimeglobpattern.cpp b/src/corelib/mimetypes/qmimeglobpattern.cpp
index cd42b4da83..fd06f6ab6b 100644
--- a/src/corelib/mimetypes/qmimeglobpattern.cpp
+++ b/src/corelib/mimetypes/qmimeglobpattern.cpp
@@ -39,7 +39,7 @@
 
 #include "qmimeglobpattern_p.h"
 
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QStringList>
 #include <QDebug>
 
@@ -142,8 +142,8 @@ bool QMimeGlobPattern::matchFileName(const QString &inputFilename) const
         return (m_pattern == filename);
 
     // Other (quite rare) patterns, like "*.anim[1-9j]": use slow but correct method
-    QRegExp rx(m_pattern, Qt::CaseSensitive, QRegExp::WildcardUnix);
-    return rx.exactMatch(filename);
+    QRegularExpression rx(QRegularExpression::anchoredPattern(QRegularExpression::wildcardToRegularExpression(m_pattern)));
+    return rx.match(filename).hasMatch();
 }
 
 static bool isFastPattern(const QString &pattern)
-- 
cgit v1.2.3


From 2955afdf31e94eff79121acc7085a19c035a6dbe Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 15 Dec 2018 14:29:18 +0100
Subject: QMimeGlobPattern: update use of wildcardToRegularExpresion

Following the update of qtbase because of QTBUG-72539, the code using
wildcardToRegularExpression must be updated as anchoredPattern is not
needed anymore.

Task-number: QTBUG-72539
Change-Id: I4989b42c737eb17d65c6b1d3cefab3ffd2163bfc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/mimetypes/qmimeglobpattern.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/mimetypes/qmimeglobpattern.cpp')

diff --git a/src/corelib/mimetypes/qmimeglobpattern.cpp b/src/corelib/mimetypes/qmimeglobpattern.cpp
index fd06f6ab6b..e353ba10cc 100644
--- a/src/corelib/mimetypes/qmimeglobpattern.cpp
+++ b/src/corelib/mimetypes/qmimeglobpattern.cpp
@@ -142,7 +142,7 @@ bool QMimeGlobPattern::matchFileName(const QString &inputFilename) const
         return (m_pattern == filename);
 
     // Other (quite rare) patterns, like "*.anim[1-9j]": use slow but correct method
-    QRegularExpression rx(QRegularExpression::anchoredPattern(QRegularExpression::wildcardToRegularExpression(m_pattern)));
+    QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(m_pattern));
     return rx.match(filename).hasMatch();
 }
 
-- 
cgit v1.2.3