Merge remote-tracking branch 'gerrit/5.5' into neard

Change-Id: I066a9aca0120e7002c2506959bd80a08f96f4e65

3 files changed, 14 insertions, 1 deletions

diff --git a/src/nfc/qndefnfcsmartposterrecord.cpp b/src/nfc/qndefnfcsmartposterrecord.cpp
index 9bec5b7a..b71b8ac2 100644
--- a/src/nfc/qndefnfcsmartposterrecord.cpp
+++ b/src/nfc/qndefnfcsmartposterrecord.cpp
@@ -92,6 +92,18 @@ QNdefNfcSmartPosterRecord::QNdefNfcSmartPosterRecord(const QNdefNfcSmartPosterRe
 }
 
 /*!
+    Assigns the \a other smart poster record to this record and returns a reference to
+    this record.
+*/
+QNdefNfcSmartPosterRecord &QNdefNfcSmartPosterRecord::operator=(const QNdefNfcSmartPosterRecord &other)
+{
+    if (this != &other)
+        d = other.d;
+
+    return *this;
+}
+
+/*!
     Destroys the smart poster.
 */
 QNdefNfcSmartPosterRecord::~QNdefNfcSmartPosterRecord()
diff --git a/src/nfc/qndefnfcsmartposterrecord.h b/src/nfc/qndefnfcsmartposterrecord.h
index d02cdabb..3b813a28 100644
--- a/src/nfc/qndefnfcsmartposterrecord.h
+++ b/src/nfc/qndefnfcsmartposterrecord.h
@@ -80,6 +80,7 @@ public:
     QNdefNfcSmartPosterRecord();
     QNdefNfcSmartPosterRecord(const QNdefRecord &other);
     QNdefNfcSmartPosterRecord(const QNdefNfcSmartPosterRecord &other);
+    QNdefNfcSmartPosterRecord &operator=(const QNdefNfcSmartPosterRecord &other);
     ~QNdefNfcSmartPosterRecord();
 
     void setPayload(const QByteArray &payload);
diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h
index 10c89a87..fef74946 100644
--- a/src/nfc/qnearfieldtarget.h
+++ b/src/nfc/qnearfieldtarget.h
@@ -63,7 +63,7 @@ public:
         NfcTagType2,
         NfcTagType3,
         NfcTagType4,
-        MifareTag,
+        MifareTag
     };
 
     enum AccessMethod {