From cee576d58b3e7d6ea8a9a5bff53bb86fc528cab9 Mon Sep 17 00:00:00 2001 From: Bernd Weimer Date: Mon, 9 Sep 2013 16:41:32 +0200 Subject: BlackBerry: Ensured that proper sensor.h file is used Change-Id: I746cbf971b88cdffcfc5d675d27d0dda5bac95ad Reviewed-by: Thomas McGuire --- src/plugins/sensors/blackberry/bbsensorbackend.h | 4 ++-- 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 4e7b8101..953d7bcf 100644 --- a/src/plugins/sensors/blackberry/bbsensorbackend.h +++ b/src/plugins/sensors/blackberry/bbsensorbackend.h @@ -45,8 +45,8 @@ #include #include -// 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 diff --git a/src/plugins/sensors/blackberry/sensor.h b/src/plugins/sensors/blackberry/sensor.h index fb5b935d..7317f076 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_ -- cgit v1.2.3