diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp
index ea43bbc0f43526ba6248ee487dc5c355a1e4e6d5..2b979244a00e2c0f30e4ac1e7edb065fd6eacee9 100644
--- a/src/bluetooth/qlowenergycontroller_bluez.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluez.cpp
@@ -333,6 +333,7 @@ void QLowEnergyControllerPrivateBluez::init()
             requestTimer->setInterval(gattRequestTimeout);
             connect(requestTimer, &QTimer::timeout,
                     this, &QLowEnergyControllerPrivateBluez::handleGattRequestTimeout);
+            qRegisterMetaTypeStreamOperators<QBluetoothUuid>();
         }
     }
 }
diff --git a/src/nfc/qnearfieldmanager_android_p.h b/src/nfc/qnearfieldmanager_android_p.h
index 563d26bc451d07ae112503704616d83a197f5ee8..7bf444d9b8bb524d90e0e24912ea0a16060dbb1a 100644
--- a/src/nfc/qnearfieldmanager_android_p.h
+++ b/src/nfc/qnearfieldmanager_android_p.h
@@ -73,18 +73,18 @@ class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate, public And
 
 public:
     QNearFieldManagerPrivateImpl();
-    ~QNearFieldManagerPrivateImpl();
+    ~QNearFieldManagerPrivateImpl() override;
 
-    virtual bool isAvailable() const;
+    bool isAvailable() const override;
     bool isSupported() const override;
-    virtual bool startTargetDetection();
-    virtual void stopTargetDetection();
-    virtual int registerNdefMessageHandler(QObject *object, const QMetaMethod &method);
-    virtual int registerNdefMessageHandler(const QNdefFilter &filter, QObject *object, const QMetaMethod &method);
-    virtual bool unregisterNdefMessageHandler(int handlerId);
-    virtual void requestAccess(QNearFieldManager::TargetAccessModes accessModes);
-    virtual void releaseAccess(QNearFieldManager::TargetAccessModes accessModes);
-    virtual void newIntent(QAndroidJniObject intent);
+    bool startTargetDetection() override;
+    void stopTargetDetection() override;
+    int registerNdefMessageHandler(QObject *object, const QMetaMethod &method) override;
+    int registerNdefMessageHandler(const QNdefFilter &filter, QObject *object, const QMetaMethod &method) override;
+    bool unregisterNdefMessageHandler(int handlerId) override;
+    void requestAccess(QNearFieldManager::TargetAccessModes accessModes) override;
+    void releaseAccess(QNearFieldManager::TargetAccessModes accessModes) override;
+    void newIntent(QAndroidJniObject intent);
     QByteArray getUid(const QAndroidJniObject &intent);
 
 public slots:
diff --git a/src/nfc/qnearfieldmanager_emulator_p.h b/src/nfc/qnearfieldmanager_emulator_p.h
index 1b660a23636646d0fc9e91ecb1c9e49082d8a8d0..0416388ab0014367db8351188d17d4a596adcce1 100644
--- a/src/nfc/qnearfieldmanager_emulator_p.h
+++ b/src/nfc/qnearfieldmanager_emulator_p.h
@@ -67,9 +67,9 @@ class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivateVirtualBase
 
 public:
     QNearFieldManagerPrivateImpl();
-    ~QNearFieldManagerPrivateImpl();
+    ~QNearFieldManagerPrivateImpl() override;
 
-    bool isAvailable() const;
+    bool isAvailable() const override;
 
     void reset();
 
diff --git a/src/nfc/qnearfieldmanager_neard_p.h b/src/nfc/qnearfieldmanager_neard_p.h
index cf0269829f640655a8a9de66b5bd302c628e586f..88c45c1cbbffb1e44df03a3908d3d1381ebb0eac 100644
--- a/src/nfc/qnearfieldmanager_neard_p.h
+++ b/src/nfc/qnearfieldmanager_neard_p.h
@@ -71,26 +71,27 @@ class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate
 
 public:
     QNearFieldManagerPrivateImpl();
-    ~QNearFieldManagerPrivateImpl();
+    ~QNearFieldManagerPrivateImpl() override;
 
-    bool isAvailable() const;
+    bool isAvailable() const override;
 
     bool isSupported() const override;
 
-    bool startTargetDetection();
+    bool startTargetDetection() override;
 
-    void stopTargetDetection();
+    void stopTargetDetection() override;
 
     // not implemented
-    int registerNdefMessageHandler(QObject *object, const QMetaMethod &method);
+    int registerNdefMessageHandler(QObject *object, const QMetaMethod &method) override;
 
-    int registerNdefMessageHandler(const QNdefFilter &filter, QObject *object, const QMetaMethod &method);
+    int registerNdefMessageHandler(const QNdefFilter &filter, QObject *object,
+                                   const QMetaMethod &method) override;
 
-    bool unregisterNdefMessageHandler(int handlerId);
+    bool unregisterNdefMessageHandler(int handlerId) override;
 
-    void requestAccess(QNearFieldManager::TargetAccessModes accessModes);
+    void requestAccess(QNearFieldManager::TargetAccessModes accessModes) override;
 
-    void releaseAccess(QNearFieldManager::TargetAccessModes accessModes);
+    void releaseAccess(QNearFieldManager::TargetAccessModes accessModes) override;
 
 private Q_SLOTS:
     void handleTagFound(const QDBusObjectPath&);
diff --git a/src/nfc/qnearfieldmanagervirtualbase_p.h b/src/nfc/qnearfieldmanagervirtualbase_p.h
index 3d8cf2ef3f4f5356d87cfa9ef50ab178c2bdd855..164edaf5897d3957ed33fa8c666782a6486e1cfb 100644
--- a/src/nfc/qnearfieldmanagervirtualbase_p.h
+++ b/src/nfc/qnearfieldmanagervirtualbase_p.h
@@ -63,16 +63,16 @@ class QNearFieldManagerPrivateVirtualBase : public QNearFieldManagerPrivate
 
 public:
     QNearFieldManagerPrivateVirtualBase();
-    ~QNearFieldManagerPrivateVirtualBase();
+    ~QNearFieldManagerPrivateVirtualBase() override;
 
-    bool startTargetDetection();
-    void stopTargetDetection();
+    bool startTargetDetection() override;
+    void stopTargetDetection() override;
 
-    int registerNdefMessageHandler(QObject *object, const QMetaMethod &method);
+    int registerNdefMessageHandler(QObject *object, const QMetaMethod &method) override;
     int registerNdefMessageHandler(const QNdefFilter &filter,
-                                   QObject *object, const QMetaMethod &method);
+                                   QObject *object, const QMetaMethod &method) override;
 
-    bool unregisterNdefMessageHandler(int id);
+    bool unregisterNdefMessageHandler(int id) override;
 
 protected:
     struct Callback {