diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2019-02-11 08:21:47 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2019-02-11 08:21:58 +0100 |
| commit | 56c5b16dc1a394c72a004b71a9f5364059630d6c (patch) | |
| tree | 7fc631b270636d42449871c0c894b9a5998821d9 /src/nfc/qqmlndefrecord.cpp | |
| parent | c3820b3d04aca98ee4e0d5eb85b23819c039532f (diff) | |
| parent | cd2f90d9157199ebadcf182a471f264a619fd521 (diff) | |
Merge remote-tracking branch 'gerrit/dev' into wip/win
Change-Id: I3402f42380068e3e6e7b3df8b15a712f0d86a3cd
Diffstat (limited to 'src/nfc/qqmlndefrecord.cpp')
| -rw-r--r-- | src/nfc/qqmlndefrecord.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nfc/qqmlndefrecord.cpp b/src/nfc/qqmlndefrecord.cpp index a7304f00..bc3667fe 100644 --- a/src/nfc/qqmlndefrecord.cpp +++ b/src/nfc/qqmlndefrecord.cpp @@ -40,7 +40,7 @@ #include "qqmlndefrecord.h" #include <QtCore/QMap> -#include <QtCore/QRegExp> +#include <QtCore/QRegularExpression> #include <QtCore/qglobalstatic.h> @@ -219,8 +219,8 @@ QQmlNdefRecord *qNewDeclarativeNdefRecordForNdefRecord(const QNdefRecord &record while (i.hasNext()) { i.next(); - QRegExp ex(i.key()); - if (!ex.exactMatch(urn)) + QRegularExpression rx(QRegularExpression::anchoredPattern(i.key())); + if (!rx.match(urn).hasMatch()) continue; const QMetaObject *metaObject = i.value(); |