diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:54:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 16:13:30 +0100 |
| commit | f8857127320f513e9ec2132bc4af5c470362f37a (patch) | |
| tree | 08b409ae3d9dce33d01ab238277fc16c18978785 /src/nfc/qqmlndefrecord.h | |
| parent | efd55bafb4f067bc7ee606ce75266cdfdd0282c0 (diff) | |
| parent | 97194a4b7282e01cc1da3571abdbc11bb29dfe86 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/bluetooth/qlowenergycontroller.h
Change-Id: I15571e47fbf06545d46d1b9a9b2b47bf815ae293
Diffstat (limited to 'src/nfc/qqmlndefrecord.h')
| -rw-r--r-- | src/nfc/qqmlndefrecord.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nfc/qqmlndefrecord.h b/src/nfc/qqmlndefrecord.h index b9f3c132..9e8d8bbd 100644 --- a/src/nfc/qqmlndefrecord.h +++ b/src/nfc/qqmlndefrecord.h @@ -69,8 +69,8 @@ public: }; Q_ENUM(TypeNameFormat) - explicit QQmlNdefRecord(QObject *parent = 0); - explicit QQmlNdefRecord(const QNdefRecord &record, QObject *parent = 0); + explicit QQmlNdefRecord(QObject *parent = Q_NULLPTR); + explicit QQmlNdefRecord(const QNdefRecord &record, QObject *parent = Q_NULLPTR); ~QQmlNdefRecord(); QString type() const; |