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 --- src/network/kernel/qnetworkproxy_win.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/network/kernel/qnetworkproxy_win.cpp') diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index dffc0adf8f..9dfe32d5f7 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -212,8 +212,7 @@ static bool isBypassed(const QString &host, const QStringList &bypassList) return true; // excluded } else { // do wildcard matching - QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(entry), - QRegularExpression::CaseInsensitiveOption); + auto rx = QRegularExpression::fromWildcard(entry, Qt::CaseInsensitive); if (rx.match(host).hasMatch()) return true; } -- cgit v1.2.3