From adf829e65d0837c043dbfdfaba49dd145debe954 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 15 Apr 2020 10:52:51 +0200
Subject: Add a QRegularExpression::fromWildcard() convenience method

Simplify constructing QRegularExpression objects from a glob
pattern.

Change-Id: I06f60b1dfea3da969e2474dedd44b6ca5d456d7d
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 qmake/generators/unix/unixmake2.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'qmake/generators/unix/unixmake2.cpp')

diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 09af15130ff..92edd1e7b63 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -1533,10 +1533,9 @@ std::pair<bool, QString> UnixMakefileGenerator::writeObjectsPart(QTextStream &t,
         for (ProStringList::ConstIterator objit = objs.begin(); objit != objs.end(); ++objit) {
             bool increment = false;
             for (ProStringList::ConstIterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
-                auto pattern =
-                        QRegularExpression::wildcardToRegularExpression((*incrit).toQString(),
-                                                                        QRegularExpression::UnanchoredWildcardConversion);
-                if ((*objit).toQString().contains(QRegularExpression(pattern))) {
+                auto regexp = QRegularExpression::fromWildcard((*incrit).toQString(), Qt::CaseSensitive,
+                                                               QRegularExpression::UnanchoredWildcardConversion);
+                if ((*objit).toQString().contains(regexp)) {
                     increment = true;
                     incrs_out.append((*objit));
                     break;
-- 
cgit v1.2.3