diff options
author | Bernd Weimer <bweimer@blackberry.com> | 2013-09-09 16:41:32 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 13:41:47 +0200 |
commit | cee576d58b3e7d6ea8a9a5bff53bb86fc528cab9 (patch) | |
tree | fbbcf075bd90b9855c8b39cf3d80d9e20f69a947 /src/plugins/sensors | |
parent | e6e740b5cfacbaa816d461f74bec4240aaa99e21 (diff) | |
download | qtsensors-cee576d58b3e7d6ea8a9a5bff53bb86fc528cab9.tar.gz |
BlackBerry: Ensured that proper sensor.h file is used
Change-Id: I746cbf971b88cdffcfc5d675d27d0dda5bac95ad
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'src/plugins/sensors')
-rw-r--r-- | src/plugins/sensors/blackberry/bbsensorbackend.h | 4 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/sensor.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/sensors/blackberry/bbsensorbackend.h b/src/plugins/sensors/blackberry/bbsensorbackend.h index 4e7b810..953d7bc 100644 --- a/src/plugins/sensors/blackberry/bbsensorbackend.h +++ b/src/plugins/sensors/blackberry/bbsensorbackend.h @@ -45,8 +45,8 @@ #include <QtCore/QFile> #include <QtCore/QSocketNotifier> -// Earlier NDK versions did not ship sensor.h, that is why we have our own copy in -// here. +// Earlier NDK versions did not ship sensor.h and the Playbook NDK still +// doesn't include it, 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> diff --git a/src/plugins/sensors/blackberry/sensor.h b/src/plugins/sensors/blackberry/sensor.h index fb5b935..7317f07 100644 --- a/src/plugins/sensors/blackberry/sensor.h +++ b/src/plugins/sensors/blackberry/sensor.h @@ -40,8 +40,12 @@ ****************************************************************************/ // -// This file is a temporary copy until it becomes available in the Blackberry NDK. +// This file is a copy of the "sensor.h" header for the BlackBerry Playbook OS. +// It is only inclulded here, because it is not available in the the Playbook NDK. // +#if !defined(Q_OS_BLACKBERRY_TABLET) +#error "This file is supposed to be used only for BlackBerry Playbook OS." +#endif #ifndef SENSOR_H_ #define SENSOR_H_ |