From 2c1d2691e853812a06d435ffcf61e17f82edb224 Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
Date: Wed, 30 Dec 2015 12:00:08 +0000
Subject: tvOS support

Builds but not tested
Moved Q_DECLARE_METATYPE outside of namespace to fix namespaced builds

Change-Id: I19c1dba904da8fad155f0f612b863e8f5e0c422e
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
---
 src/bluetooth/bluetooth.pro              | 3 +--
 src/bluetooth/osx/osxbtcentralmanager.mm | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

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 2f881f79..e197a78c 100644
--- a/src/bluetooth/osx/osxbtcentralmanager.mm
+++ b/src/bluetooth/osx/osxbtcentralmanager.mm
@@ -43,12 +43,13 @@
 #include <algorithm>
 #include <limits>
 
-QT_BEGIN_NAMESPACE
 
 Q_DECLARE_METATYPE(QLowEnergyCharacteristic)
 Q_DECLARE_METATYPE(QLowEnergyDescriptor)
 Q_DECLARE_METATYPE(QLowEnergyHandle)
 
+QT_BEGIN_NAMESPACE
+
 namespace OSXBluetooth {
 
 NSUInteger qt_countGATTEntries(CBService *service)
@@ -80,7 +81,6 @@ NSUInteger qt_countGATTEntries(CBService *service)
 
 QT_END_NAMESPACE
 
-QT_USE_NAMESPACE
 
 @interface QT_MANGLE_NAMESPACE(OSXBTCentralManager) (PrivateAPI)
 
-- 
cgit v1.2.3