diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-11-21 13:46:35 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-11-22 09:37:16 +0100 |
| commit | c3820b3d04aca98ee4e0d5eb85b23819c039532f (patch) | |
| tree | 3d5b149c4c32fb7934d33e114e47f05500bc2fa0 /src/bluetooth/bluetooth.pro | |
| parent | 6cdb8dc9cd8a518d050d08be79938feee7a9bde2 (diff) | |
| parent | 0446463da215fb14a6d5e70f3f9e5d8c2137d296 (diff) | |
Merge remote-tracking branch 'gerrit/dev' into win32
Change-Id: Ie99a67b63f8259227f42f5b464c6bbc16e79313b
Diffstat (limited to 'src/bluetooth/bluetooth.pro')
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index c90364c6..eedd4864 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -1,6 +1,6 @@ TARGET = QtBluetooth QT = core core-private - +DEFINES += QT_NO_FOREACH QMAKE_DOCS = $$PWD/doc/qtbluetooth.qdocconf OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator @@ -87,7 +87,7 @@ win32 { qtConfig(bluez) { QT_PRIVATE = concurrent - QT_FOR_PRIVATE += dbus + QT_FOR_PRIVATE += dbus network # do not link against QtNetwork but use inline qt_safe_* functions INCLUDEPATH += $$QT.network_private.includes @@ -229,10 +229,17 @@ qtConfig(bluez) { qbluetoothservicediscoveryagent_winrt.cpp \ qbluetoothserviceinfo_winrt.cpp \ qbluetoothsocket_winrt.cpp \ + qbluetoothutils_winrt.cpp \ qlowenergycontroller_winrt.cpp PRIVATE_HEADERS += qlowenergycontroller_winrt_p.h \ - qbluetoothsocket_winrt_p.h + qbluetoothsocket_winrt_p.h \ + qbluetoothutils_winrt_p.h + + qtConfig(winrt_btle_no_pairing) { + SOURCES += qlowenergycontroller_winrt_new.cpp + PRIVATE_HEADERS += qlowenergycontroller_winrt_new_p.h + } lessThan(WINDOWS_SDK_VERSION, 14393) { DEFINES += QT_WINRT_LIMITED_SERVICEDISCOVERY |