diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-05-20 12:49:44 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-05-23 05:58:18 +0000 |
| commit | 7393531856058a8a0fe440d3a64728248958ac81 (patch) | |
| tree | 1a2723b0ecc1387fe073696460afc9cb2e1dc428 /src/bluetooth/qlowenergycontroller_p.cpp | |
| parent | 6909acfd09de1ab56075efcc82c1937cbdfd6470 (diff) | |
Bluetooth on iOS needs some of 'default' (or 'dummy') implementations,
but does not want warnings like 'Dummy backend running', as it's
not really dummy. Also, having printDummyWarning calls
can end-up in a linker error since we do not build dummy_helper.cpp on iOS.
The solution is to ifndef all these calls/includes.
Change-Id: I9c64f2bacbc6134ed30d75f85f9df0194add418d
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/qlowenergycontroller_p.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_p.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bluetooth/qlowenergycontroller_p.cpp b/src/bluetooth/qlowenergycontroller_p.cpp index 9cbc6633..328bdb64 100644 --- a/src/bluetooth/qlowenergycontroller_p.cpp +++ b/src/bluetooth/qlowenergycontroller_p.cpp @@ -32,7 +32,9 @@ ****************************************************************************/ #include "qlowenergycontroller_p.h" +#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" +#endif QT_BEGIN_NAMESPACE @@ -41,7 +43,9 @@ QLowEnergyControllerPrivate::QLowEnergyControllerPrivate() state(QLowEnergyController::UnconnectedState), error(QLowEnergyController::NoError) { +#ifndef QT_IOS_BLUETOOTH printDummyWarning(); +#endif registerQLowEnergyControllerMetaType(); } |