diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:04:50 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:04:50 +0100 |
| commit | 6e0f49fa664731dc0479f3e8d9b3f2914357f74e (patch) | |
| tree | 64d952435c46c815c5141184234ac0725f62e44f | |
| parent | 47673cc99431bc92de866da6b22b84313b7092f2 (diff) | |
| parent | 0a4366a16dfda251a4c2edf619f846cde8ad9f8a (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Id42e98826b0a992e80b84f91b3b5026d60e2699d
| -rw-r--r-- | src/bluetooth/qbluetoothsocket.h | 1 | ||||
| -rw-r--r-- | src/nfc/qqmlndefrecord.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index cf76e8b8..d2535544 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -186,7 +186,6 @@ protected: explicit QBluetoothSocket(QBluetoothSocketBasePrivate *d, QBluetoothServiceInfo::Protocol socketType, QObject *parent = nullptr); - friend class QBluetoothServerPrivate; #endif #ifndef QT_OSX_BLUETOOTH QBluetoothSocketBasePrivate *d_ptr; 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(); |