diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2019-08-05 11:28:30 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2019-08-12 08:09:19 +0200 |
| commit | cfc5eaa6904354fc3084659691a6f28a51bf2269 (patch) | |
| tree | da49c1c9717a03cdc2e69970ad4848e989e6bb8c /src/nfc/qqmlndefrecord.cpp | |
| parent | 8b7b52d66f2616040ca4aaae3f2732be96e19ab8 (diff) | |
| parent | 99db6526341e6f0f2a4798088c1f954cff013b7b (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/win"
Diffstat (limited to 'src/nfc/qqmlndefrecord.cpp')
| -rw-r--r-- | src/nfc/qqmlndefrecord.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nfc/qqmlndefrecord.cpp b/src/nfc/qqmlndefrecord.cpp index bc3667fe..5a96bec8 100644 --- a/src/nfc/qqmlndefrecord.cpp +++ b/src/nfc/qqmlndefrecord.cpp @@ -215,10 +215,9 @@ QQmlNdefRecord *qNewDeclarativeNdefRecordForNdefRecord(const QNdefRecord &record { const QString urn = urnForRecordType(record.typeNameFormat(), record.type()); - QMapIterator<QString, const QMetaObject *> i(*registeredNdefRecordTypes()); - while (i.hasNext()) { - i.next(); + const auto *rt = registeredNdefRecordTypes(); + for (auto i = rt->cbegin(), end = rt->cend(); i != end; ++i) { QRegularExpression rx(QRegularExpression::anchoredPattern(i.key())); if (!rx.match(urn).hasMatch()) continue; |