diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-15 10:52:51 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-06 09:57:40 +0200 |
| commit | adf829e65d0837c043dbfdfaba49dd145debe954 (patch) | |
| tree | c45291cbe4ff82b9ec2d5f2ae008066b839dfd1a /qmake | |
| parent | 56a7984a90992371cd7f54a061dcc791e6f22cfd (diff) | |
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 3 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 7 | ||||
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 2 |
3 files changed, 5 insertions, 7 deletions
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(' ')); diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 09af15130f..92edd1e7b6 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; diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index f78537c340..75296fa1dd 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -1636,7 +1636,7 @@ bool QMakeEvaluator::isActiveConfig(const QStringRef &config, bool regex) return m_hostBuild; if (regex && (config.contains(QLatin1Char('*')) || config.contains(QLatin1Char('?')))) { - QRegularExpression re(QRegularExpression::wildcardToRegularExpression(config.toString())); + auto re = QRegularExpression::fromWildcard(config.toString()); // mkspecs if (re.match(m_qmakespecName).hasMatch()) |