From 588a68a3f135888671546cfcd94dc20af0cb9f4f Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Wed, 11 Mar 2015 16:57:44 +0100
Subject: Qualify positioning headers when including them from elsewhere

There are some corner cases in which you cannot rely on qmake
to generate module-specific include directives for the compiler
when building different parts of the same module. The rules on
this are complicated and it's easy to make mistakes.

Qualified includes are also locatable without module-specific
include directives. It's generally a good idea to qualify
includes from the same module but a different library in order
not to rely on qmake's magic too much.

Change-Id: I8703116c7c5c898394d7f393630cbfa655174605
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
---
 tests/auto/positionplugin/plugin.cpp                       |  4 ++--
 tests/auto/positionplugintest/tst_positionplugin.cpp       |  8 ++++----
 tests/auto/qgeoaddress/tst_qgeoaddress.cpp                 |  2 +-
 tests/auto/qgeoareamonitor/logfilepositionsource.h         |  2 +-
 tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp         | 14 +++++++-------
 tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp           |  2 +-
 tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp       |  2 +-
 .../qgeopositioninfosource/testqgeopositioninfosource.cpp  |  4 ++--
 .../qgeopositioninfosource/testqgeopositioninfosource_p.h  |  2 +-
 tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp     |  2 +-
 .../testqgeosatelliteinfosource.cpp                        |  4 ++--
 .../tst_dummynmeapositioninfosource.cpp                    |  2 +-
 .../qnmeapositioninfosourceproxyfactory.h                  |  2 +-
 .../qnmeapositioninfosource/tst_qnmeapositioninfosource.h  |  2 +-
 14 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/positionplugin/plugin.cpp b/tests/auto/positionplugin/plugin.cpp
index 3571f6ec..d590e333 100644
--- a/tests/auto/positionplugin/plugin.cpp
+++ b/tests/auto/positionplugin/plugin.cpp
@@ -31,8 +31,8 @@
 **
 ****************************************************************************/
 
-#include <qgeopositioninfosource.h>
-#include <qgeopositioninfosourcefactory.h>
+#include <QtPositioning/qgeopositioninfosource.h>
+#include <QtPositioning/qgeopositioninfosourcefactory.h>
 #include <QObject>
 #include <QtPlugin>
 #include <QTimer>
diff --git a/tests/auto/positionplugintest/tst_positionplugin.cpp b/tests/auto/positionplugintest/tst_positionplugin.cpp
index 43aa2351..aaa1c3a7 100644
--- a/tests/auto/positionplugintest/tst_positionplugin.cpp
+++ b/tests/auto/positionplugintest/tst_positionplugin.cpp
@@ -35,10 +35,10 @@
 
 #include <QtTest/QtTest>
 #include <QSignalSpy>
-#include <qgeopositioninfosource.h>
-#include <qgeosatelliteinfosource.h>
-#include <qgeoareamonitorsource.h>
-#include <qgeocoordinate.h>
+#include <QtPositioning/qgeopositioninfosource.h>
+#include <QtPositioning/qgeosatelliteinfosource.h>
+#include <QtPositioning/qgeoareamonitorsource.h>
+#include <QtPositioning/qgeocoordinate.h>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qgeoaddress/tst_qgeoaddress.cpp b/tests/auto/qgeoaddress/tst_qgeoaddress.cpp
index 0f46a0ec..9f9cda96 100644
--- a/tests/auto/qgeoaddress/tst_qgeoaddress.cpp
+++ b/tests/auto/qgeoaddress/tst_qgeoaddress.cpp
@@ -34,7 +34,7 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
-#include <qgeoaddress.h>
+#include <QtPositioning/qgeoaddress.h>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qgeoareamonitor/logfilepositionsource.h b/tests/auto/qgeoareamonitor/logfilepositionsource.h
index 4aae9895..73a5ec02 100644
--- a/tests/auto/qgeoareamonitor/logfilepositionsource.h
+++ b/tests/auto/qgeoareamonitor/logfilepositionsource.h
@@ -34,7 +34,7 @@
 #ifndef LOGFILEPOSITIONSOURCE_H
 #define LOGFILEPOSITIONSOURCE_H
 
-#include <qgeopositioninfosource.h>
+#include <QtPositioning/qgeopositioninfosource.h>
 
 QT_BEGIN_NAMESPACE
 class QFile;
diff --git a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
index e61eaf1a..6da752c3 100644
--- a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
+++ b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
@@ -43,13 +43,13 @@
 #include <QDebug>
 #include <QDataStream>
 
-#include <qgeoareamonitorinfo.h>
-#include <qgeoareamonitorsource.h>
-#include <qgeopositioninfo.h>
-#include <qgeopositioninfosource.h>
-#include <qnmeapositioninfosource.h>
-#include <qgeocircle.h>
-#include <qgeorectangle.h>
+#include <QtPositioning/qgeoareamonitorinfo.h>
+#include <QtPositioning/qgeoareamonitorsource.h>
+#include <QtPositioning/qgeopositioninfo.h>
+#include <QtPositioning/qgeopositioninfosource.h>
+#include <QtPositioning/qnmeapositioninfosource.h>
+#include <QtPositioning/qgeocircle.h>
+#include <QtPositioning/qgeorectangle.h>
 
 #include "logfilepositionsource.h"
 
diff --git a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
index a7440587..8a8b7467 100644
--- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
+++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
@@ -35,7 +35,7 @@
 
 #include "../utils/qlocationtestutils_p.h"
 
-#include <qgeocoordinate.h>
+#include <QtPositioning/qgeocoordinate.h>
 #include <qtest.h>
 
 #include <QMetaType>
diff --git a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
index 4ffdd8c1..4a453ca3 100644
--- a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
+++ b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
@@ -33,7 +33,7 @@
 
 //TESTED_COMPONENT=src/location
 
-#include <qgeopositioninfo.h>
+#include <QtPositioning/qgeopositioninfo.h>
 
 #include <QMetaType>
 #include <QObject>
diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
index 353e7f32..5d52127b 100644
--- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
+++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
@@ -42,8 +42,8 @@
 #include <limits.h>
 
 #include <qnumeric.h>
-#include <qgeopositioninfosource.h>
-#include <qgeopositioninfo.h>
+#include <QtPositioning/qgeopositioninfosource.h>
+#include <QtPositioning/qgeopositioninfo.h>
 
 #include "testqgeopositioninfosource_p.h"
 #include "../utils/qlocationtestutils_p.h"
diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource_p.h b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource_p.h
index f64ee4c0..5c80d2bd 100644
--- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource_p.h
+++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource_p.h
@@ -34,7 +34,7 @@
 #ifndef TESTQGEOPOSITIONINFOSOURCE_P_H
 #define TESTQGEOPOSITIONINFOSOURCE_P_H
 
-#include <qgeopositioninfosource.h>
+#include <QtPositioning/qgeopositioninfosource.h>
 
 #ifdef TST_GEOCLUEMOCK_ENABLED
 #include "geocluemock.h"
diff --git a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
index 9a857351..81225691 100644
--- a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
+++ b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
@@ -33,7 +33,7 @@
 
 //TESTED_COMPONENT=src/location
 
-#include <qgeosatelliteinfo.h>
+#include <QtPositioning/qgeosatelliteinfo.h>
 
 #include <QMetaType>
 #include <QObject>
diff --git a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
index 68ef36b0..c825cdad 100644
--- a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
+++ b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
@@ -39,8 +39,8 @@
 #include <QDebug>
 #include <QTimer>
 
-#include <qgeosatelliteinfosource.h>
-#include <qgeosatelliteinfo.h>
+#include <QtPositioning/qgeosatelliteinfosource.h>
+#include <QtPositioning/qgeosatelliteinfo.h>
 
 #include "testqgeosatelliteinfosource_p.h"
 #include "../utils/qlocationtestutils_p.h"
diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
index bbee1a1f..a3dd1d31 100644
--- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
+++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
@@ -37,7 +37,7 @@
 #include "../qgeopositioninfosource/testqgeopositioninfosource_p.h"
 #include "../utils/qlocationtestutils_p.h"
 
-#include <qnmeapositioninfosource.h>
+#include <QtPositioning/qnmeapositioninfosource.h>
 #include <QSignalSpy>
 #include <QTest>
 
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h
index d5017e28..772313e9 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h
@@ -36,7 +36,7 @@
 
 #include <QObject>
 
-#include <qnmeapositioninfosource.h>
+#include <QtPositioning/qnmeapositioninfosource.h>
 
 QT_BEGIN_NAMESPACE
 class QTcpServer;
diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h
index 03ecd9f2..e31d7fb2 100644
--- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h
+++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h
@@ -35,7 +35,7 @@
 #include "../qgeopositioninfosource/testqgeopositioninfosource_p.h"
 #include "../utils/qlocationtestutils_p.h"
 
-#include <qnmeapositioninfosource.h>
+#include <QtPositioning/qnmeapositioninfosource.h>
 
 #include <QTest>
 #include <QDir>
-- 
cgit v1.2.1