summaryrefslogtreecommitdiffstats
path: root/src/network/kernel/qnetworkproxy_mac.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-04-15 10:52:51 +0200
committerLars Knoll <lars.knoll@qt.io>2020-05-06 09:57:40 +0200
commitadf829e65d0837c043dbfdfaba49dd145debe954 (patch)
treec45291cbe4ff82b9ec2d5f2ae008066b839dfd1a /src/network/kernel/qnetworkproxy_mac.cpp
parent56a7984a90992371cd7f54a061dcc791e6f22cfd (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 'src/network/kernel/qnetworkproxy_mac.cpp')
-rw-r--r--src/network/kernel/qnetworkproxy_mac.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp
index 4c582bfa71..3fcd9299f3 100644
--- a/src/network/kernel/qnetworkproxy_mac.cpp
+++ b/src/network/kernel/qnetworkproxy_mac.cpp
@@ -110,8 +110,7 @@ static bool isHostExcluded(CFDictionaryRef dict, const QString &host)
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;
}