fix obs build

Change-Id: Ia70486a0c6b813829ffd633f5334945f73d3b628
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>

43 files changed, 60 insertions, 58 deletions

diff --git a/src/imports/sensors/qmlaccelerometer.cpp b/src/imports/sensors/qmlaccelerometer.cpp
index be153eb6..1a6ee07e 100644
--- a/src/imports/sensors/qmlaccelerometer.cpp
+++ b/src/imports/sensors/qmlaccelerometer.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlaccelerometer.h"
-#include <QAccelerometer>
+#include <QtSensors/QAccelerometer>
 
 /*!
     \qmltype Accelerometer
diff --git a/src/imports/sensors/qmlaltimeter.cpp b/src/imports/sensors/qmlaltimeter.cpp
index 317b759e..36868381 100644
--- a/src/imports/sensors/qmlaltimeter.cpp
+++ b/src/imports/sensors/qmlaltimeter.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include "qmlaltimeter.h"
-#include <QAltimeter>
+#include <QtSensors/QAltimeter>
 
 /*!
     \qmltype Altimeter
diff --git a/src/imports/sensors/qmlambientlightsensor.cpp b/src/imports/sensors/qmlambientlightsensor.cpp
index 32c4261b..64a635b4 100644
--- a/src/imports/sensors/qmlambientlightsensor.cpp
+++ b/src/imports/sensors/qmlambientlightsensor.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlambientlightsensor.h"
-#include <QAmbientLightSensor>
+#include <QtSensors/QAmbientLightSensor>
 
 /*!
     \qmltype AmbientLightSensor
diff --git a/src/imports/sensors/qmlambientlightsensor.h b/src/imports/sensors/qmlambientlightsensor.h
index 7715a39f..f37b2914 100644
--- a/src/imports/sensors/qmlambientlightsensor.h
+++ b/src/imports/sensors/qmlambientlightsensor.h
@@ -43,7 +43,7 @@
 #define QMLAMBIENTLIGHTSENSOR_H
 
 #include "qmlsensor.h"
-#include <QAmbientLightSensor>
+#include <QtSensors/QAmbientLightSensor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/sensors/qmlambienttemperaturesensor.cpp b/src/imports/sensors/qmlambienttemperaturesensor.cpp
index 6128af13..4a81b0d3 100644
--- a/src/imports/sensors/qmlambienttemperaturesensor.cpp
+++ b/src/imports/sensors/qmlambienttemperaturesensor.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include "qmlambienttemperaturesensor.h"
-#include <QAmbientTemperatureSensor>
+#include <QtSensors/QAmbientTemperatureSensor>
 
 /*!
     \qmltype AmbientTemperatureSensor
diff --git a/src/imports/sensors/qmlcompass.cpp b/src/imports/sensors/qmlcompass.cpp
index ce5f4280..52d7ac20 100644
--- a/src/imports/sensors/qmlcompass.cpp
+++ b/src/imports/sensors/qmlcompass.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlcompass.h"
-#include <QCompass>
+#include <QtSensors/QCompass>
 
 /*!
     \qmltype Compass
diff --git a/src/imports/sensors/qmlgyroscope.cpp b/src/imports/sensors/qmlgyroscope.cpp
index 1e936800..f52251f1 100644
--- a/src/imports/sensors/qmlgyroscope.cpp
+++ b/src/imports/sensors/qmlgyroscope.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlgyroscope.h"
-#include <QGyroscope>
+#include <QtSensors/QGyroscope>
 
 /*!
     \qmltype Gyroscope
diff --git a/src/imports/sensors/qmlholstersensor.cpp b/src/imports/sensors/qmlholstersensor.cpp
index b5fd8c8b..7e00235f 100644
--- a/src/imports/sensors/qmlholstersensor.cpp
+++ b/src/imports/sensors/qmlholstersensor.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include "qmlholstersensor.h"
-#include <QHolsterSensor>
+#include <QtSensors/QHolsterSensor>
 
 /*!
     \qmltype HolsterSensor
diff --git a/src/imports/sensors/qmlirproximitysensor.cpp b/src/imports/sensors/qmlirproximitysensor.cpp
index 3263fc6c..896840db 100644
--- a/src/imports/sensors/qmlirproximitysensor.cpp
+++ b/src/imports/sensors/qmlirproximitysensor.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlirproximitysensor.h"
-#include <QIRProximitySensor>
+#include <QtSensors/QIRProximitySensor>
 
 /*!
     \qmltype IRProximitySensor
diff --git a/src/imports/sensors/qmllightsensor.cpp b/src/imports/sensors/qmllightsensor.cpp
index 8d12ad42..9d76e421 100644
--- a/src/imports/sensors/qmllightsensor.cpp
+++ b/src/imports/sensors/qmllightsensor.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmllightsensor.h"
-#include <QLightSensor>
+#include <QtSensors/QLightSensor>
 
 /*!
     \qmltype LightSensor
diff --git a/src/imports/sensors/qmlmagnetometer.cpp b/src/imports/sensors/qmlmagnetometer.cpp
index aa1a05d2..f617962d 100644
--- a/src/imports/sensors/qmlmagnetometer.cpp
+++ b/src/imports/sensors/qmlmagnetometer.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlmagnetometer.h"
-#include <QMagnetometer>
+#include <QtSensors/QMagnetometer>
 
 /*!
     \qmltype Magnetometer
diff --git a/src/imports/sensors/qmlorientationsensor.cpp b/src/imports/sensors/qmlorientationsensor.cpp
index d0c86dd3..d8661998 100644
--- a/src/imports/sensors/qmlorientationsensor.cpp
+++ b/src/imports/sensors/qmlorientationsensor.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlorientationsensor.h"
-#include <QOrientationSensor>
+#include <QtSensors/QOrientationSensor>
 
 /*!
     \qmltype OrientationSensor
diff --git a/src/imports/sensors/qmlorientationsensor.h b/src/imports/sensors/qmlorientationsensor.h
index 35e9d6fb..4927b58b 100644
--- a/src/imports/sensors/qmlorientationsensor.h
+++ b/src/imports/sensors/qmlorientationsensor.h
@@ -43,7 +43,7 @@
 #define QMLORIENTATIONSENSOR_H
 
 #include "qmlsensor.h"
-#include <QOrientationSensor>
+#include <QtSensors/QOrientationSensor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/sensors/qmlpressuresensor.cpp b/src/imports/sensors/qmlpressuresensor.cpp
index a9736c4f..a22762a3 100644
--- a/src/imports/sensors/qmlpressuresensor.cpp
+++ b/src/imports/sensors/qmlpressuresensor.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include "qmlpressuresensor.h"
-#include <QPressureSensor>
+#include <QtSensors/QPressureSensor>
 
 /*!
     \qmltype PressureSensor
diff --git a/src/imports/sensors/qmlproximitysensor.cpp b/src/imports/sensors/qmlproximitysensor.cpp
index 21c92c91..702833db 100644
--- a/src/imports/sensors/qmlproximitysensor.cpp
+++ b/src/imports/sensors/qmlproximitysensor.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlproximitysensor.h"
-#include <QProximitySensor>
+#include <QtSensors/QProximitySensor>
 
 /*!
     \qmltype ProximitySensor
diff --git a/src/imports/sensors/qmlrotationsensor.cpp b/src/imports/sensors/qmlrotationsensor.cpp
index 42541487..eb125996 100644
--- a/src/imports/sensors/qmlrotationsensor.cpp
+++ b/src/imports/sensors/qmlrotationsensor.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlrotationsensor.h"
-#include <QRotationSensor>
+#include <QtSensors/QRotationSensor>
 
 /*!
     \qmltype RotationSensor
diff --git a/src/imports/sensors/qmlsensor.cpp b/src/imports/sensors/qmlsensor.cpp
index b8f049c1..a9cff391 100644
--- a/src/imports/sensors/qmlsensor.cpp
+++ b/src/imports/sensors/qmlsensor.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlsensor.h"
-#include <QSensor>
+#include <QtSensors/QSensor>
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/imports/sensors/qmlsensorgesture.cpp b/src/imports/sensors/qmlsensorgesture.cpp
index 42aa25f7..42bb3585 100644
--- a/src/imports/sensors/qmlsensorgesture.cpp
+++ b/src/imports/sensors/qmlsensorgesture.cpp
@@ -1,4 +1,4 @@
-/****************************************************************************
+    /****************************************************************************
 **
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qmlsensorgesture.h"
-#include <qsensorgesture.h>
-#include <qsensorgesturemanager.h>
+#include <QtSensors/qsensorgesture.h>
+#include <QtSensors/qsensorgesturemanager.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/sensors/qmlsensorglobal.cpp b/src/imports/sensors/qmlsensorglobal.cpp
index ea8e44d6..bd0dc213 100644
--- a/src/imports/sensors/qmlsensorglobal.cpp
+++ b/src/imports/sensors/qmlsensorglobal.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlsensorglobal.h"
-#include <QSensor>
+#include <QtSensors/QSensor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/sensors/qmltapsensor.cpp b/src/imports/sensors/qmltapsensor.cpp
index 266a4f94..d86d0aaf 100644
--- a/src/imports/sensors/qmltapsensor.cpp
+++ b/src/imports/sensors/qmltapsensor.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmltapsensor.h"
-#include <QTapSensor>
+#include <QtSensors/QTapSensor>
 
 /*!
     \qmltype TapSensor
diff --git a/src/imports/sensors/qmltapsensor.h b/src/imports/sensors/qmltapsensor.h
index b0c2fa5c..38b15497 100644
--- a/src/imports/sensors/qmltapsensor.h
+++ b/src/imports/sensors/qmltapsensor.h
@@ -43,7 +43,7 @@
 #define QMLTAPSENSOR_H
 
 #include "qmlsensor.h"
-#include <QTapSensor>
+#include <QtSensors/QTapSensor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
index 5df98cc2..87506b25 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 444a8e68..1a9f51b8 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 e1e660b3..9d3ba840 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 9f72582a..7e2635a4 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 d8dc0097..8749cd0b 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 37f66058..55f6dd56 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 647b713f..cb232f80 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 c9f58ddd..22fccac9 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 5dba87a5..232ae35e 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 9715902a..f9999029 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 34455ace..d9e974a9 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 1729f3ee..7cf1ea8b 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 5db192af..08c81510 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 a8aef52e..487b80ef 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 e7478b6a..64088f53 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 d1204d22..4979b1dc 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 939b2a9c..919a2c10 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 1ed6e76e..f9066522 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 d1e7d343..95ec4ab8 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 693528fa..6b86eeae 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 f62c1f58..d781728f 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 aa9f58c2..dcaa4988 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>