5 files changed, 7 insertions, 9 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index 6cf0795c..67a001d2 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -154,7 +154,7 @@ config_bluez:qtHaveModule(dbus) {
     SOURCES -= qlowenergyservice.cpp
     SOURCES -= qlowenergycontroller.cpp
     SOURCES -= qlowenergycontroller_p.cpp
-} else:ios {
+} else:ios|tvos {
     DEFINES += QT_IOS_BLUETOOTH
     LIBS += -framework Foundation -framework CoreBluetooth
 
@@ -197,4 +197,3 @@ config_bluez:qtHaveModule(dbus) {
 OTHER_FILES +=
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
-
diff --git a/src/bluetooth/osx/osxbtcentralmanager.mm b/src/bluetooth/osx/osxbtcentralmanager.mm
index f96da5c6..21ba1b81 100644
--- a/src/bluetooth/osx/osxbtcentralmanager.mm
+++ b/src/bluetooth/osx/osxbtcentralmanager.mm
@@ -80,7 +80,6 @@ NSUInteger qt_countGATTEntries(CBService *service)
 
 QT_END_NAMESPACE
 
-QT_USE_NAMESPACE
 
 @interface QT_MANGLE_NAMESPACE(OSXBTCentralManager) (PrivateAPI)
 
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
index ae51d681..87172654 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
@@ -194,7 +194,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::startBluez5(const QBluetoothAddress
  * done out-of-process to avoid license issues. At this stage Bluez uses GPLv2.
  */
 void QBluetoothServiceDiscoveryAgentPrivate::runExternalSdpScan(
-        const QBluetoothAddress &remoteAddress, const QBluetoothAddress localAddress)
+        const QBluetoothAddress &remoteAddress, const QBluetoothAddress &localAddress)
 {
     Q_Q(QBluetoothServiceDiscoveryAgent);
 
@@ -426,7 +426,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_createdDevice(QDBusPendingCallWa
     discoverServices(deviceObjectPath.value().path());
 }
 
-void QBluetoothServiceDiscoveryAgentPrivate::discoverServices(const QString deviceObjectPath)
+void QBluetoothServiceDiscoveryAgentPrivate::discoverServices(const QString &deviceObjectPath)
 {
     Q_Q(QBluetoothServiceDiscoveryAgent);
 
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
index c4d5017a..595dd04c 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -137,12 +137,12 @@ private:
 #ifdef QT_BLUEZ_BLUETOOTH
     void startBluez5(const QBluetoothAddress &address);
     void runExternalSdpScan(const QBluetoothAddress &remoteAddress,
-                    const QBluetoothAddress localAddress);
+                    const QBluetoothAddress &localAddress);
     void sdpScannerDone(int exitCode, QProcess::ExitStatus exitStatus);
     QVariant readAttributeValue(QXmlStreamReader &xml);
     QBluetoothServiceInfo parseServiceXml(const QString& xml);
     void performMinimalServiceDiscovery(const QBluetoothAddress &deviceAddress);
-    void discoverServices(const QString deviceObjectPath);
+    void discoverServices(const QString &deviceObjectPath);
 #endif
 
 public:
diff --git a/src/nfc/qnearfieldmanager_emulator_p.h b/src/nfc/qnearfieldmanager_emulator_p.h
index 0fd980f9..a71c9fd5 100644
--- a/src/nfc/qnearfieldmanager_emulator_p.h
+++ b/src/nfc/qnearfieldmanager_emulator_p.h
@@ -50,7 +50,7 @@
 #include "qndeffilter.h"
 
 #include <QtCore/QObject>
-#include <QtCore/QWeakPointer>
+#include <QtCore/QPointer>
 
 QT_BEGIN_NAMESPACE
 
@@ -74,7 +74,7 @@ private slots:
 private:
     void ndefReceived(const QNdefMessage &message, QNearFieldTarget *target);
 
-    QMap<TagBase *, QWeakPointer<QNearFieldTarget> > m_targets;
+    QMap<TagBase *, QPointer<QNearFieldTarget> > m_targets;
 
 };