10 files changed, 21 insertions, 22 deletions
diff --git a/tests/auto/qsensor/test_backends.cpp b/tests/auto/qsensor/test_backends.cpp
index f8ac2622..b091d2f8 100644
--- a/tests/auto/qsensor/test_backends.cpp
+++ b/tests/auto/qsensor/test_backends.cpp
@@ -41,8 +41,7 @@
 
 #include <QList>
 
-#include <QtSensors/qsensorbackend.h>
-#include <QtSensors/qsensormanager.h>
+#include "qsensorbackend.h"
 
 typedef QSensorBackend* (*CreateFunc) (QSensor *sensor);
 class Record
diff --git a/tests/auto/qsensor/test_backends.h b/tests/auto/qsensor/test_backends.h
index 376d7ca5..d58793da 100644
--- a/tests/auto/qsensor/test_backends.h
+++ b/tests/auto/qsensor/test_backends.h
@@ -42,21 +42,21 @@
 #ifndef TEST_BACKENDS_H
 #define TEST_BACKENDS_H
 
-#include <QtSensors/qsensorbackend.h>
+#include <qsensorbackend.h>
 
 void register_test_backends();
 void unregister_test_backends();
 
-#include <QtSensors/qaccelerometer.h>
-#include <QtSensors/qambientlightsensor.h>
-#include <QtSensors/qcompass.h>
-#include <QtSensors/qgyroscope.h>
-#include <QtSensors/qlightsensor.h>
-#include <QtSensors/qmagnetometer.h>
-#include <QtSensors/qorientationsensor.h>
-#include <QtSensors/qproximitysensor.h>
-#include <QtSensors/qrotationsensor.h>
-#include <QtSensors/qtapsensor.h>
+#include <qaccelerometer.h>
+#include <qambientlightsensor.h>
+#include <qcompass.h>
+#include <qgyroscope.h>
+#include <qlightsensor.h>
+#include <qmagnetometer.h>
+#include <qorientationsensor.h>
+#include <qproximitysensor.h>
+#include <qrotationsensor.h>
+#include <qtapsensor.h>
 
 #define PREPARE_SENSORINTERFACE_DECLS(SensorClass, ReadingClass, FilterClass, readingcode)\
     class SensorClass ## _impl : public QSensorBackend\
diff --git a/tests/auto/qsensor/test_sensor.h b/tests/auto/qsensor/test_sensor.h
index 436af251..cc7a278a 100644
--- a/tests/auto/qsensor/test_sensor.h
+++ b/tests/auto/qsensor/test_sensor.h
@@ -42,7 +42,7 @@
 #ifndef TEST_SENSOR_H
 #define TEST_SENSOR_H
 
-#include <QtSensors/qsensor.h>
+#include <qsensor.h>
 
 class TestSensorReadingPrivate;
 
diff --git a/tests/auto/qsensor/test_sensor2.h b/tests/auto/qsensor/test_sensor2.h
index ba632b3e..93b20687 100644
--- a/tests/auto/qsensor/test_sensor2.h
+++ b/tests/auto/qsensor/test_sensor2.h
@@ -42,7 +42,7 @@
 #ifndef TEST_SENSOR2_H
 #define TEST_SENSOR2_H
 
-#include <QtSensors/qsensor.h>
+#include "qsensor.h"
 
 #undef DECLARE_READING
 #undef DECLARE_READING_D
diff --git a/tests/auto/qsensor/test_sensor2_p.h b/tests/auto/qsensor/test_sensor2_p.h
index 87a9e637..0e84230d 100644
--- a/tests/auto/qsensor/test_sensor2_p.h
+++ b/tests/auto/qsensor/test_sensor2_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <5.0.0/QtSensors/private/qsensor_p.h>
+#include "private/qsensor_p.h"
 
 class TestSensor2ReadingPrivate : public QSensorReadingPrivate
 {
diff --git a/tests/auto/qsensor/test_sensor2impl.cpp b/tests/auto/qsensor/test_sensor2impl.cpp
index fcecef29..04ee6fb0 100644
--- a/tests/auto/qsensor/test_sensor2impl.cpp
+++ b/tests/auto/qsensor/test_sensor2impl.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "test_sensor2impl.h"
+#include <qaccelerometer.h>
 #include <QDebug>
 
 char const * const testsensor2impl::id("test sensor 2 impl");
diff --git a/tests/auto/qsensor/test_sensor2impl.h b/tests/auto/qsensor/test_sensor2impl.h
index ebd72192..7fb0b348 100644
--- a/tests/auto/qsensor/test_sensor2impl.h
+++ b/tests/auto/qsensor/test_sensor2impl.h
@@ -42,7 +42,7 @@
 #ifndef TEST_SENSOR2IMPL_H
 #define TEST_SENSOR2IMPL_H
 
-#include <QtSensors/qsensorbackend.h>
+#include <qsensorbackend.h>
 #include "test_sensor2.h"
 
 class testsensor2impl : public QSensorBackend
diff --git a/tests/auto/qsensor/test_sensorimpl.h b/tests/auto/qsensor/test_sensorimpl.h
index d8fff884..35afb7ee 100644
--- a/tests/auto/qsensor/test_sensorimpl.h
+++ b/tests/auto/qsensor/test_sensorimpl.h
@@ -42,7 +42,7 @@
 #ifndef TEST_SENSORIMPL_H
 #define TEST_SENSORIMPL_H
 
-#include <QtSensors/qsensorbackend.h>
+#include <qsensorbackend.h>
 #include "test_sensor.h"
 
 class testsensorimpl : public QSensorBackend
diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp
index 9f2d69c8..c501377a 100644
--- a/tests/auto/qsensor/test_sensorplugin.cpp
+++ b/tests/auto/qsensor/test_sensorplugin.cpp
@@ -41,9 +41,9 @@
 
 #include "test_sensorimpl.h"
 #include "test_sensor2impl.h"
-#include <QtSensors/qsensorplugin.h>
-#include <QtSensors/qsensorbackend.h>
-#include <QtSensors/qsensormanager.h>
+#include <qsensorplugin.h>
+#include <qsensorbackend.h>
+#include <qsensormanager.h>
 #include <QFile>
 #include <QDebug>
 #include <QTest>
diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp
index 7807bc87..0765750d 100644
--- a/tests/auto/qsensor/tst_qsensor.cpp
+++ b/tests/auto/qsensor/tst_qsensor.cpp
@@ -49,7 +49,6 @@
 #include <QSignalSpy>
 
 #include "qsensor.h"
-#include "qsensormanager.h"
 #include "test_sensor.h"
 #include "test_sensor2.h"
 #include "test_sensorimpl.h"