diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-05-07 22:13:25 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 23:47:23 +0200 |
| commit | e9fb333408058add56dcf53238675ec185001771 (patch) | |
| tree | ea391f0a6bca35701bb960a559a4b405cadb0637 /src | |
| parent | fb06538ffb57d82ae63b61dc7798f740fe27ba3e (diff) | |
Prefer to use the BBNDK sensor.h if present
Change-Id: Ife482d8acb5a533f61e009bf65ec37215a7af595
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src')
| -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 \ |