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/qlowenergycontroller.cpp | |
| parent | 6cdb8dc9cd8a518d050d08be79938feee7a9bde2 (diff) | |
| parent | 0446463da215fb14a6d5e70f3f9e5d8c2137d296 (diff) | |
Merge remote-tracking branch 'gerrit/dev' into win32
Change-Id: Ie99a67b63f8259227f42f5b464c6bbc16e79313b
Diffstat (limited to 'src/bluetooth/qlowenergycontroller.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp index 14efe764..c3742b76 100644 --- a/src/bluetooth/qlowenergycontroller.cpp +++ b/src/bluetooth/qlowenergycontroller.cpp @@ -55,7 +55,11 @@ #elif defined(QT_ANDROID_BLUETOOTH) #include "qlowenergycontroller_android_p.h" #elif defined(QT_WINRT_BLUETOOTH) +#include "qtbluetoothglobal_p.h" #include "qlowenergycontroller_winrt_p.h" +#if QT_CONFIG(winrt_btle_no_pairing) +#include "qlowenergycontroller_winrt_new_p.h" +#endif #elif defined(QT_WIN_BLUETOOTH) #include "qlowenergycontroller_win_p.h" #else @@ -67,6 +71,7 @@ QT_BEGIN_NAMESPACE Q_DECLARE_LOGGING_CATEGORY(QT_BT) +Q_DECLARE_LOGGING_CATEGORY(QT_BT_WINRT) /*! \class QLowEnergyController @@ -312,7 +317,12 @@ static QLowEnergyControllerPrivate *privateController(QLowEnergyController::Role return new QLowEnergyControllerPrivateAndroid(); #elif defined(QT_WINRT_BLUETOOTH) Q_UNUSED(role); +#if QT_CONFIG(winrt_btle_no_pairing) + return createWinRTLowEnergyController(); +#else + qCDebug(QT_BT_WINRT) << "Using pre 15063 low energy controller"; return new QLowEnergyControllerPrivateWinRT(); +#endif #elif defined(QT_WIN_BLUETOOTH) return new QLowEnergyControllerPrivateWin32(); #else |