[Development] Qt 5.5.0 header diff: QtNfc.diff

[Frederik Gladhorn]

diff --git a/src/nfc/qndeffilter.h b/src/nfc/qndeffilter.h
index 053dfe2..56721bf 100644
--- a/src/nfc/qndeffilter.h
+++ b/src/nfc/qndeffilter.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);
@@ -124,6 +125,7 @@ public:
     quint32 size() const;
     void setSize(quint32 size);
 
+    //TODO Qt 6 the mimetype should be QString as it is UTF-8
     QByteArray typeInfo() const;
     void setTypeInfo(const QByteArray &type);
 
diff --git a/src/nfc/qndefnfctextrecord.h b/src/nfc/qndefnfctextrecord.h
index 05a8594..e2f0691 100644
--- a/src/nfc/qndefnfctextrecord.h
+++ b/src/nfc/qndefnfctextrecord.h
@@ -63,7 +63,7 @@ public:
         NfcTagType2,
         NfcTagType3,
         NfcTagType4,
-        MifareTag,
+        MifareTag
     };
 
     enum AccessMethod {
diff --git a/src/nfc/qnfcglobal.h b/src/nfc/qnfcglobal.h
index 4b975c3..26916a9 100644
--- a/src/nfc/qnfcglobal.h
+++ b/src/nfc/qnfcglobal.h

_______________________________________________
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development