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>
---
 config.tests/bbsensor_header/bbsensor_header.pro |  5 +++
 config.tests/bbsensor_header/main.cpp            | 56 ++++++++++++++++++++++++
 src/plugins/sensors/blackberry/bbsensorbackend.h | 10 +++++
 src/plugins/sensors/blackberry/blackberry.pro    |  2 +
 sync.profile                                     |  7 +++
 5 files changed, 80 insertions(+)
 create mode 100644 config.tests/bbsensor_header/bbsensor_header.pro
 create mode 100644 config.tests/bbsensor_header/main.cpp

diff --git a/config.tests/bbsensor_header/bbsensor_header.pro b/config.tests/bbsensor_header/bbsensor_header.pro
new file mode 100644
index 00000000..362ae67b
--- /dev/null
+++ b/config.tests/bbsensor_header/bbsensor_header.pro
@@ -0,0 +1,5 @@
+TEMPLATE = app
+DEPENDPATH += .
+INCLUDEPATH += .
+
+SOURCES += main.cpp
diff --git a/config.tests/bbsensor_header/main.cpp b/config.tests/bbsensor_header/main.cpp
new file mode 100644
index 00000000..6ebc6f3d
--- /dev/null
+++ b/config.tests/bbsensor_header/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Research In Motion
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtSensors module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore/qglobal.h>
+
+#ifdef Q_OS_BLACKBERRY
+#include <sensor/sensor.h>
+#endif
+
+int main(int argc, char** argv)
+{
+    Q_UNUSED(argc);
+    Q_UNUSED(argv);
+#ifdef Q_OS_BLACKBERRY
+    sensor_event_t event;
+    Q_UNUSED(event);
+#endif
+    return 0;
+}
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 \
diff --git a/sync.profile b/sync.profile
index 0ef30d96..46616531 100644
--- a/sync.profile
+++ b/sync.profile
@@ -17,3 +17,10 @@
     "qtdeclarative" => "refs/heads/master",
     "qtjsbackend" => "refs/heads/master",
 );
+
+# Compile tests
+%configtests = (
+    # Blackberry tests
+    "bbsensor_header" => {},
+);
+
-- 
cgit v1.2.3