From 9e17571ccbd5d7bced57c3920287b55e3f8131c4 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@jollamobile.com>
Date: Thu, 3 Apr 2014 08:54:22 +1000
Subject: fix obs build

Change-Id: Ia70486a0c6b813829ffd633f5334945f73d3b628
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
---
 .../sensorgestures/qtsensors/qcoversensorgesturerecognizer.h      | 2 +-
 .../qtsensors/qdoubletapsensorgesturerecognizer.cpp               | 2 +-
 .../sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h  | 4 ++--
 .../sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h   | 2 +-
 .../sensorgestures/qtsensors/qhoversensorgesturerecognizer.h      | 2 +-
 .../sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h     | 2 +-
 src/plugins/sensorgestures/qtsensors/qshake2recognizer.h          | 2 +-
 src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp   | 1 +
 src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h     | 7 ++++---
 src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp    | 2 +-
 src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h      | 2 +-
 .../sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h   | 2 +-
 .../sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h      | 2 +-
 .../sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h       | 2 +-
 src/plugins/sensorgestures/shake/qshakerecognizer.h               | 2 +-
 src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp    | 2 +-
 src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h      | 2 +-
 src/plugins/sensors/generic/genericalssensor.h                    | 6 +++---
 src/plugins/sensors/generic/genericorientationsensor.h            | 6 +++---
 src/plugins/sensors/generic/genericrotationsensor.h               | 8 ++++----
 src/plugins/sensors/generic/generictiltsensor.h                   | 6 +++---
 src/plugins/sensors/generic/main.cpp                              | 6 +++---
 22 files changed, 37 insertions(+), 35 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
index 5df98cc..87506b2 100644
--- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
@@ -43,7 +43,7 @@
 #ifndef QCOVERSENSORGESTURERECOGNIZER_H
 #define QCOVERSENSORGESTURERECOGNIZER_H
 
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
 #include <QTimer>
 
 #include "qtsensorgesturesensorhandler.h"
diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp
index 444a8e6..1a9f51b 100644
--- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QTapSensor>
+#include <QtSensors/QTapSensor>
 #include "qdoubletapsensorgesturerecognizer.h"
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
index e1e660b..9d3ba84 100644
--- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
@@ -44,8 +44,8 @@
 
 #include <QtSensors/QSensor>
 
-#include <qsensorgesturerecognizer.h>
-#include <QTapSensor>
+#include <QtSensors/qsensorgesturerecognizer.h>
+#include <QtSensors/QTapSensor>
 
 #include "qtsensorgesturesensorhandler.h"
 
diff --git a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
index 9f72582..7e2635a 100644
--- a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
@@ -44,7 +44,7 @@
 #ifndef QFREEFALLSENSORGESTURERECOGNIZER_H
 #define QFREEFALLSENSORGESTURERECOGNIZER_H
 
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
 
 #include "qtsensorgesturesensorhandler.h"
 
diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
index d8dc009..8749cd0 100644
--- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
@@ -43,7 +43,7 @@
 #ifndef QHOVERSENSORGESTURERECOGNIZER_H
 #define QHOVERSENSORGESTURERECOGNIZER_H
 
-#include <QSensorGestureRecognizer>
+#include <QtSensors/QSensorGestureRecognizer>
 
 #include "qtsensorgesturesensorhandler.h"
 
diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
index 37f6605..55f6dd5 100644
--- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
@@ -43,7 +43,7 @@
 #ifndef QPICKUPSENSORGESTURERECOGNIZER_H
 #define QPICKUPSENSORGESTURERECOGNIZER_H
 
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
 #include "qtsensorgesturesensorhandler.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
index 647b713..cb232f8 100644
--- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
@@ -44,7 +44,7 @@
 
 #include <QDebug>
 
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
 
 #include "qtsensorgesturesensorhandler.h"
 
diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp
index c9f58dd..22fccac 100644
--- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp
@@ -42,6 +42,7 @@
 #include "qslamgesturerecognizer.h"
 #include "qtsensorgesturesensorhandler.h"
 
+
 #include <QtCore/qmath.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
index 5dba87a..232ae35 100644
--- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
@@ -43,10 +43,11 @@
 #ifndef QSLAMSENSORGESTURERECOGNIZER_H
 #define QSLAMSENSORGESTURERECOGNIZER_H
 
-#include <qsensorgesturerecognizer.h>
-#include <QtSensors>
+#include <QtSensors/qsensorgesturerecognizer.h>
 #include <QtSensors/QOrientationSensor>
-
+#include <QtSensors/QAccelerometer>
+#include <QtSensors/QAccelerometerReading>
+#include <QtSensors/QOrientationReading>
 QT_BEGIN_NAMESPACE
 
 class QSlamSensorGestureRecognizer : public QSensorGestureRecognizer
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp
index 9715902..f999902 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp
@@ -45,7 +45,7 @@
 
 #include "qtsensorgestureplugin.h"
 
-#include <qsensorgestureplugininterface.h>
+#include <QtSensors/qsensorgestureplugininterface.h>
 
 #include "qcoversensorgesturerecognizer.h"
 #include "qtwistsensorgesturerecognizer.h"
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
index 34455ac..d9e974a 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
@@ -45,7 +45,7 @@
 #include <QObject>
 #include <QStringList>
 
-#include <qsensorgestureplugininterface.h>
+#include <QtSensors/qsensorgestureplugininterface.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
index 1729f3e..7cf1ea8 100644
--- a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
@@ -42,7 +42,7 @@
 #ifndef QTURNOVERSENSORGESTURERECOGNIZER_H
 #define QTURNOVERSENSORGESTURERECOGNIZER_H
 
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
 #include "qtsensorgesturesensorhandler.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
index 5db192a..08c8151 100644
--- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
@@ -43,7 +43,7 @@
 #ifndef QWFLICKSENSORGESTURERECOGNIZER_H
 #define QWFLICKSENSORGESTURERECOGNIZER_H
 
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
 #include <QtSensors/QAccelerometer>
 #include <QtSensors/QOrientationSensor>
 #include "qtsensorgesturesensorhandler.h"
diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
index a8aef52..487b80e 100644
--- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
@@ -43,7 +43,7 @@
 #ifndef QWHIPSENSORGESTURERECOGNIZER_H
 #define QWHIPSENSORGESTURERECOGNIZER_H
 
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
 
 #include "qtsensorgesturesensorhandler.h"
 
diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h
index e7478b6..64088f5 100644
--- a/src/plugins/sensorgestures/shake/qshakerecognizer.h
+++ b/src/plugins/sensorgestures/shake/qshakerecognizer.h
@@ -49,7 +49,7 @@
 #include <QDebug>
 #include <QTimer>
 
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
 
  struct AccelData {
     qreal x;
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp
index d1204d2..4979b1d 100644
--- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp
+++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp
@@ -45,7 +45,7 @@
 
 #include "qshakesensorgestureplugin.h"
 
-#include <qsensorgestureplugininterface.h>
+#include <QtSensors/qsensorgestureplugininterface.h>
 
 #include "qshakerecognizer.h"
 
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
index 939b2a9..919a2c1 100644
--- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
+++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
@@ -45,7 +45,7 @@
 #include <QObject>
 #include <QStringList>
 
-#include <qsensorgestureplugininterface.h>
+#include <QtSensors/qsensorgestureplugininterface.h>
 
 class QShakeSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface
 {
diff --git a/src/plugins/sensors/generic/genericalssensor.h b/src/plugins/sensors/generic/genericalssensor.h
index 1ed6e76..f906652 100644
--- a/src/plugins/sensors/generic/genericalssensor.h
+++ b/src/plugins/sensors/generic/genericalssensor.h
@@ -42,9 +42,9 @@
 #ifndef GENERICALSSENSOR_H
 #define GENERICALSSENSOR_H
 
-#include <qsensorbackend.h>
-#include <qlightsensor.h>
-#include <qambientlightsensor.h>
+#include <QtSensors/qsensorbackend.h>
+#include <QtSensors/qlightsensor.h>
+#include <QtSensors/qambientlightsensor.h>
 
 class genericalssensor : public QSensorBackend, public QLightFilter
 {
diff --git a/src/plugins/sensors/generic/genericorientationsensor.h b/src/plugins/sensors/generic/genericorientationsensor.h
index d1e7d34..95ec4ab 100644
--- a/src/plugins/sensors/generic/genericorientationsensor.h
+++ b/src/plugins/sensors/generic/genericorientationsensor.h
@@ -42,9 +42,9 @@
 #ifndef GENERICORIENTATIONSENSOR_H
 #define GENERICORIENTATIONSENSOR_H
 
-#include <qsensorbackend.h>
-#include <qorientationsensor.h>
-#include <qaccelerometer.h>
+#include <QtSensors/qsensorbackend.h>
+#include <QtSensors/qorientationsensor.h>
+#include <QtSensors/qaccelerometer.h>
 
 class genericorientationsensor : public QSensorBackend, public QAccelerometerFilter
 {
diff --git a/src/plugins/sensors/generic/genericrotationsensor.h b/src/plugins/sensors/generic/genericrotationsensor.h
index 693528f..6b86eea 100644
--- a/src/plugins/sensors/generic/genericrotationsensor.h
+++ b/src/plugins/sensors/generic/genericrotationsensor.h
@@ -42,10 +42,10 @@
 #ifndef GENERICROTATIONSENSOR_H
 #define GENERICROTATIONSENSOR_H
 
-#include <qsensorbackend.h>
-#include <qrotationsensor.h>
-#include <qaccelerometer.h>
-#include <qmagnetometer.h>
+#include <QtSensors/qsensorbackend.h>
+#include <QtSensors/qrotationsensor.h>
+#include <QtSensors/qaccelerometer.h>
+#include <QtSensors/qmagnetometer.h>
 
 class genericrotationsensor : public QSensorBackend, public QSensorFilter
 {
diff --git a/src/plugins/sensors/generic/generictiltsensor.h b/src/plugins/sensors/generic/generictiltsensor.h
index f62c1f5..d781728 100644
--- a/src/plugins/sensors/generic/generictiltsensor.h
+++ b/src/plugins/sensors/generic/generictiltsensor.h
@@ -42,9 +42,9 @@
 #ifndef GENERICTILTSENSOR_H
 #define GENERICTILTSENSOR_H
 
-#include <qsensorbackend.h>
-#include <qtiltsensor.h>
-#include <qaccelerometer.h>
+#include <QtSensors/qsensorbackend.h>
+#include <QtSensors/qtiltsensor.h>
+#include <QtSensors/qaccelerometer.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/sensors/generic/main.cpp b/src/plugins/sensors/generic/main.cpp
index aa9f58c..dcaa498 100644
--- a/src/plugins/sensors/generic/main.cpp
+++ b/src/plugins/sensors/generic/main.cpp
@@ -51,9 +51,9 @@
 #ifdef QTSENSORS_GENERICTILTSENSOR
 #include "generictiltsensor.h"
 #endif
-#include <qsensorplugin.h>
-#include <qsensorbackend.h>
-#include <qsensormanager.h>
+#include <QtSensors/qsensorplugin.h>
+#include <QtSensors/qsensorbackend.h>
+#include <QtSensors/qsensormanager.h>
 #include <QFile>
 #include <QDebug>
 
-- 
cgit v1.2.1