From adf829e65d0837c043dbfdfaba49dd145debe954 Mon Sep 17 00:00:00 2001 From: Lars Knoll 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 Reviewed-by: Joerg Bornemann --- qmake/generators/makefile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qmake/generators/makefile.cpp') diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 1622a4b856..f27bb242a2 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2169,8 +2169,7 @@ MakefileGenerator::writeExtraVariables(QTextStream &t) const ProValueMap &vars = project->variables(); const ProStringList &exports = project->values("QMAKE_EXTRA_VARIABLES"); for (ProStringList::ConstIterator exp_it = exports.begin(); exp_it != exports.end(); ++exp_it) { - auto pattern = QRegularExpression::wildcardToRegularExpression((*exp_it).toQString()); - QRegularExpression rx(pattern, QRegularExpression::CaseInsensitiveOption); + auto rx = QRegularExpression::fromWildcard((*exp_it).toQString(), Qt::CaseInsensitive); for (ProValueMap::ConstIterator it = vars.begin(); it != vars.end(); ++it) { if (rx.match(it.key().toQString()).hasMatch()) outlist << ("EXPORT_" + it.key() + " = " + it.value().join(' ')); -- cgit v1.2.3