Merge remote-tracking branch 'origin/dev' into wip/win

Change-Id: I83175151c0eef1a11d2f21648cc04c86e46777c1

1 files changed, 31 insertions, 5 deletions

diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h
index e18169f9..28e7ed53 100644
--- a/src/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/bluetooth/qbluetoothlocaldevice_p.h
@@ -85,6 +85,21 @@ QT_END_NAMESPACE
 #include <QtCore/QPair>
 #endif
 
+#ifdef QT_WINRT_BLUETOOTH
+#include <wrl.h>
+
+namespace ABI {
+    namespace Windows {
+        namespace Devices {
+            namespace Bluetooth {
+                struct IBluetoothDeviceStatics;
+                struct IBluetoothLEDeviceStatics;
+            }
+        }
+    }
+}
+#endif
+
 QT_BEGIN_NAMESPACE
 
 extern void registerQBluetoothLocalDeviceMetaType();
@@ -232,7 +247,22 @@ public:
 private:
     QBluetoothLocalDevice *q_ptr;
 };
-#elif !defined(QT_OSX_BLUETOOTH) // winrt and dummy backend
+#elif defined(QT_WINRT_BLUETOOTH)
+class QBluetoothLocalDevicePrivate : public QObject
+{
+    Q_DECLARE_PUBLIC(QBluetoothLocalDevice)
+public:
+    QBluetoothLocalDevicePrivate(QBluetoothLocalDevice *q,
+                                 QBluetoothAddress = QBluetoothAddress());
+
+    bool isValid() const;
+
+private:
+    QBluetoothLocalDevice *q_ptr;
+    Microsoft::WRL::ComPtr<ABI::Windows::Devices::Bluetooth::IBluetoothDeviceStatics> mStatics;
+    Microsoft::WRL::ComPtr<ABI::Windows::Devices::Bluetooth::IBluetoothLEDeviceStatics> mLEStatics;
+};
+#elif !defined(QT_OSX_BLUETOOTH) // dummy backend
 class QBluetoothLocalDevicePrivate : public QObject
 {
 public:
@@ -243,11 +273,7 @@ public:
 
     bool isValid() const
     {
-#ifndef QT_WINRT_BLUETOOTH
         return false;
-#else
-        return true;
-#endif
     }
 };
 #endif