diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-08-03 13:35:38 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-08-03 13:35:38 +0200 |
| commit | bb3f0064e60107c17ba5a90dd35d64116a4a8a89 (patch) | |
| tree | e1d068fdfd205f9051691542aba04882fd80e110 /src/bluetooth/qlowenergycontroller.cpp | |
| parent | 907c43f83768bf1b7fea89960ff5b60a714007d6 (diff) | |
| parent | 4976498621fb05804201dad52eab2c59d94f0da3 (diff) | |
Merge remote-tracking branch 'gerrit/btle' into dev
Merges Qt Bluetooth Low Energy port on WinRT into mainline.
Change-Id: Ic519955dfee4a57635c525a79b900340fbc5562f
Diffstat (limited to 'src/bluetooth/qlowenergycontroller.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp index c6cac44b..0095b90a 100644 --- a/src/bluetooth/qlowenergycontroller.cpp +++ b/src/bluetooth/qlowenergycontroller.cpp @@ -312,6 +312,9 @@ void QLowEnergyControllerPrivate::setError( bool QLowEnergyControllerPrivate::isValidLocalAdapter() { +#ifdef QT_WINRT_BLUETOOTH + return true; +#endif if (localAdapter.isNull()) return false; |