diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 09:42:01 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 09:42:13 +0200 |
| commit | fc2a206322f6190226ebc1f04062f2c9170f0bac (patch) | |
| tree | 7df8ca41816c24ccfa6e0c6add4612689a933bdd /src/nfc/qnearfieldtarget.h | |
| parent | ca5490859338f28e30104668a353275d23df1ec6 (diff) | |
| parent | 125cdccc346903d6e70ed26289cdaed85e26ec3f (diff) | |
Merge remote-tracking branch 'gerrit/dev' into btle
Change-Id: Ia1cbaac9774ce2bc1b6972c02bad34fa593d40ff
Diffstat (limited to 'src/nfc/qnearfieldtarget.h')
| -rw-r--r-- | src/nfc/qnearfieldtarget.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h index 641645c3..e51960f7 100644 --- a/src/nfc/qnearfieldtarget.h +++ b/src/nfc/qnearfieldtarget.h @@ -45,7 +45,7 @@ #include <QtCore/QMetaType> #include <QtCore/QObject> #include <QtCore/QSharedDataPointer> -#include <QtNfc/qnfcglobal.h> +#include <QtNfc/qtnfcglobal.h> QT_BEGIN_NAMESPACE class QString; @@ -118,7 +118,7 @@ public: QSharedDataPointer<RequestIdPrivate> d; }; - explicit QNearFieldTarget(QObject *parent = Q_NULLPTR); + explicit QNearFieldTarget(QObject *parent = nullptr); virtual ~QNearFieldTarget(); virtual QByteArray uid() const = 0; |