diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2013-01-07 15:25:25 +0100 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@jollamobile.com> | 2013-01-08 18:57:48 +0100 |
| commit | aba7b84e6cf11ec36da4ba8213456d5478733ca1 (patch) | |
| tree | d088b593e439e5eb11dc767881dd99fdece694b8 | |
| parent | b351e2eb1204309c1c87b759c2725e5ac8e116d5 (diff) | |
Fix merge error
Change-Id: Ie9c9c4e62a8a4aef4faaf31e005cfcf0c45365e0
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| -rw-r--r-- | plugins/sensors/blackberry/bbsensorbackend.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/plugins/sensors/blackberry/bbsensorbackend.h b/plugins/sensors/blackberry/bbsensorbackend.h index 45a703ee5a..abc50f76ae 100644 --- a/plugins/sensors/blackberry/bbsensorbackend.h +++ b/plugins/sensors/blackberry/bbsensorbackend.h @@ -56,17 +56,6 @@ #include "sensor.h" #endif -// 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 - QTM_USE_NAMESPACE class BbGuiHelper; |