diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:38:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:38:52 +0100 |
| commit | 1653ae6e8782fb96999a53736a773e9a31d86b8a (patch) | |
| tree | 33e114d791c9b9db48ceb79ffeb6c1ac7bab3493 /examples/bluetooth/heartrate-game/connectionhandler.cpp | |
| parent | 4462750a68cb93b5d363b6efdbe1d6a6f0e5811f (diff) | |
| parent | b274a83bf4f44d0e2642a8e3bd6bada4ccdbf83c (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I6e93fc7435a49b601a5c10519ed86d2a15125074
Diffstat (limited to 'examples/bluetooth/heartrate-game/connectionhandler.cpp')
| -rw-r--r-- | examples/bluetooth/heartrate-game/connectionhandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/bluetooth/heartrate-game/connectionhandler.cpp b/examples/bluetooth/heartrate-game/connectionhandler.cpp index 5ab85c85..3388c0a8 100644 --- a/examples/bluetooth/heartrate-game/connectionhandler.cpp +++ b/examples/bluetooth/heartrate-game/connectionhandler.cpp @@ -51,6 +51,7 @@ #include "heartrate-global.h" #include "connectionhandler.h" #include <QtBluetooth/qtbluetooth-config.h> +#include <QtCore/qsystemdetection.h> ConnectionHandler::ConnectionHandler(QObject *parent) : QObject(parent) { @@ -60,7 +61,7 @@ ConnectionHandler::ConnectionHandler(QObject *parent) : QObject(parent) bool ConnectionHandler::alive() const { -#ifdef SIMULATOR +#if defined(SIMULATOR) || defined(QT_PLATFORM_UIKIT) return true; #else return m_localDevice.isValid() && m_localDevice.hostMode() != QBluetoothLocalDevice::HostPoweredOff; |