From e9fb333408058add56dcf53238675ec185001771 Mon Sep 17 00:00:00 2001
From: Thomas McGuire <thomas.mcguire.qnx@kdab.com>
Date: Mon, 7 May 2012 22:13:25 +0200
Subject: Prefer to use the BBNDK sensor.h if present

Change-Id: Ife482d8acb5a533f61e009bf65ec37215a7af595
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
---
 src/plugins/sensors/blackberry/bbsensorbackend.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/plugins/sensors/blackberry/bbsensorbackend.h')

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
 {
-- 
cgit v1.2.3