1 files changed, 13 insertions, 10 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index bf2dce74..6d3dacc3 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -78,9 +78,8 @@ SOURCES += \
     qlowenergycontroller.cpp \
     qlowenergyserviceprivate.cpp
 
-qtConfig(bluez):qtHaveModule(dbus) {
+qtConfig(bluez) {
     QT_FOR_PRIVATE += dbus
-    DEFINES += QT_BLUEZ_BLUETOOTH
 
     include(bluez/bluez.pri)
 
@@ -190,21 +189,25 @@ qtConfig(bluez):qtHaveModule(dbus) {
     SOURCES -= qlowenergycontroller_p.cpp
     SOURCES -= qlowenergyservice.cpp
     SOURCES -= qlowenergycontroller.cpp
-} else:if(winphone|winrt-*-msvc2015) {
+} else:winrt {
     DEFINES += QT_WINRT_BLUETOOTH
     QT += core-private
 
-    # remove dummy warning once platform port is complete
-    include(dummy/dummy.pri)
-
     SOURCES += \
         qbluetoothdevicediscoveryagent_winrt.cpp \
         qbluetoothlocaldevice_p.cpp \
-        qbluetoothserver_p.cpp \
-        qbluetoothservicediscoveryagent_p.cpp \
-        qbluetoothserviceinfo_p.cpp \
-        qbluetoothsocket_p.cpp \
+        qbluetoothserver_winrt.cpp \
+        qbluetoothservicediscoveryagent_winrt.cpp \
+        qbluetoothserviceinfo_winrt.cpp \
+        qbluetoothsocket_winrt.cpp \
         qlowenergycontroller_winrt.cpp
+
+    WINRT_SDK_VERSION_STRING = $$(UCRTVersion)
+    WINRT_SDK_VERSION = $$member($$list($$split(WINRT_SDK_VERSION_STRING, .)), 2)
+    lessThan(WINRT_SDK_VERSION, 14393) {
+        DEFINES += QT_WINRT_LIMITED_SERVICEDISCOVERY
+        DEFINES += QT_UCRTVERSION=$$WINRT_SDK_VERSION
+    }
 } else {
     message("Unsupported Bluetooth platform, will not build a working QtBluetooth library.")
     message("Either no Qt D-Bus found or no BlueZ headers available.")