diff options
Diffstat (limited to 'src/plugins/sensors')
| -rw-r--r-- | src/plugins/sensors/blackberry/bbsensorbackend.h | 10 | ||||
| -rw-r--r-- | src/plugins/sensors/blackberry/blackberry.pro | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/sensors/blackberry/bbsensorbackend.h b/src/plugins/sensors/blackberry/bbsensorbackend.h index 4e4406a4..dbb07515 100644 --- a/src/plugins/sensors/blackberry/bbsensorbackend.h +++ b/src/plugins/sensors/blackberry/bbsensorbackend.h @@ -44,7 +44,17 @@ #include <qsensorbackend.h> #include <QtCore/QFile> #include <QtCore/QSocketNotifier> + +// Earlier NDK versions did not ship sensor.h, that is why we have our own copy in +// here. +// We prefer the NDK version if that exists, as that is more up-to-date. +#ifdef HAVE_NDK_SENSOR_H +#include <sensor/sensor.h> +#include <devctl.h> +#include <errno.h> +#else #include "sensor.h" +#endif class BbSensorBackendBase : public QSensorBackend { diff --git a/src/plugins/sensors/blackberry/blackberry.pro b/src/plugins/sensors/blackberry/blackberry.pro index a1c73893..c2efb36f 100644 --- a/src/plugins/sensors/blackberry/blackberry.pro +++ b/src/plugins/sensors/blackberry/blackberry.pro @@ -6,6 +6,8 @@ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII load(qt_plugin) +contains(config_test_bbsensor_header, yes):DEFINES += HAVE_NDK_SENSOR_H + DESTDIR = $$QT.sensors.plugins/sensors HEADERS += bbsensorbackend.h \ |