Reduce includes of private headers from upstream modules

Removing includes that don't seem to be needed for building the code. No
effort made yet in reviewing usage of private APIs to see if there are
public alternatives.

Change-Id: I6a41a3488aa6c2bbe6098a0ff6424627ab353686
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
(cherry picked from commit 17576f25587fe13aa23c138f126c9dd641efd49d)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

20 files changed, 4 insertions, 27 deletions

diff --git a/src/location/declarativemaps/error_messages_p.h b/src/location/declarativemaps/error_messages_p.h
index 3245d635..f08c4c76 100644
--- a/src/location/declarativemaps/error_messages_p.h
+++ b/src/location/declarativemaps/error_messages_p.h
@@ -52,7 +52,7 @@
 //
 
 
-#include <QtCore/private/qglobal_p.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
index 8044ccac..4a44e3ea 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
@@ -51,7 +51,6 @@
 #include <QPainter>
 #include <QtGui/private/qtriangulator_p.h>
 
-#include <QtPositioning/private/qdoublevector2d_p.h>
 #include <QtPositioning/private/qlocationutils_p.h>
 #include <qgeocircle.h>
 
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index ef537112..c30d4a86 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
@@ -53,7 +53,6 @@
 #include <QtPositioning/QGeoPolygon>
 #include <QtQuick/QQuickWindow>
 #include <QtQuick/QSGRectangleNode>
-#include <QtQuick/private/qquickwindow_p.h>
 #include <QtQml/qqmlinfo.h>
 #include <QtQuick/private/qquickitem_p.h>
 #include <cmath>
diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h
index ca6b7979..ea1f64b8 100644
--- a/src/location/declarativemaps/qdeclarativegeomap_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomap_p.h
@@ -64,7 +64,6 @@
 #include <QtGui/QColor>
 #include <QtPositioning/qgeorectangle.h>
 #include <QtLocation/private/qgeomap_p.h>
-#include <QtQuick/private/qquickitemchangelistener_p.h>
 
 Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeomaptype_p.h>)
 Q_MOC_INCLUDE(<QtLocation/private/qdeclarativegeoserviceprovider_p.h>)
diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
index 503a6e68..a4557b7e 100644
--- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
@@ -44,7 +44,6 @@
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QPainter>
 #include <QtQuick/private/qquickanchors_p.h>
-#include <QtQuick/private/qquickanchors_p_p.h>
 #include <QtLocation/private/qdeclarativegeomap_p.h>
 #include <QtQuick/private/qquickpainteditem_p.h>
 
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemutils.cpp b/src/location/declarativemaps/qdeclarativegeomapitemutils.cpp
index 0e0d0f81..119dee3f 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemutils.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitemutils.cpp
@@ -39,16 +39,11 @@
 ****************************************************************************/
 
 #include "qdeclarativegeomapitemutils_p.h"
-#include <QtPositioning/private/qdoublevector3d_p.h>
-#include <QtPositioning/private/qdoublematrix4x4_p.h>
 #include <QtPositioning/QGeoCoordinate>
 #include <QPointF>
 #include <QMatrix4x4>
 #include <QPainterPath>
 #include <QPainterPathStroker>
-#include <QtGui/private/qvectorpath_p.h>
-#include <QtGui/private/qtriangulatingstroker_p.h>
-#include <QtGui/private/qtriangulator_p.h>
 #include <QtPositioning/private/qclipperutils_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
index 0969a8ac..85d7a380 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
@@ -45,7 +45,6 @@
 
 #include <QtCore/QAbstractItemModel>
 #include <QtQml/QQmlContext>
-#include <QtQml/private/qqmlopenmetaobject_p.h>
 #include <QtQuick/private/qquickanimation_p.h>
 #include <QtQml/QQmlListProperty>
 
diff --git a/src/location/declarativemaps/qdeclarativegeoroute.cpp b/src/location/declarativemaps/qdeclarativegeoroute.cpp
index 8a8a123a..ae61b828 100644
--- a/src/location/declarativemaps/qdeclarativegeoroute.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoroute.cpp
@@ -46,8 +46,6 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/qqmlinfo.h>
 #include <QtQml/private/qqmlengine_p.h>
-#include <QtQml/private/qv4scopedvalue_p.h>
-#include <QtQml/private/qv4arrayobject_p.h>
 #include <QtPositioning/QGeoRectangle>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
index cd6e2247..8275d762 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
@@ -46,8 +46,6 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/qqmlinfo.h>
 #include <QtQml/private/qqmlengine_p.h>
-#include <QtQml/private/qv4scopedvalue_p.h>
-#include <QtQml/private/qv4arrayobject_p.h>
 #include <QtLocation/QGeoRoutingManager>
 #include <QtPositioning/QGeoRectangle>
 #include "qdeclarativegeomapparameter_p.h"
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
index 0bc96331..1832f6f5 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
@@ -63,7 +63,6 @@
 
 #include <QtQml/qqml.h>
 #include <QtQml/QQmlParserStatus>
-#include <QtQml/private/qv4engine_p.h>
 #include <QAbstractListModel>
 
 #include <QObject>
diff --git a/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp b/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp
index e48613d5..d6cd3cf8 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp
@@ -41,8 +41,6 @@
 
 #include <QtQml/QQmlEngine>
 #include <QtQml/private/qqmlengine_p.h>
-#include <QtQml/private/qv4scopedvalue_p.h>
-#include <QtQml/private/qv4arrayobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
index 84b8b296..4d5c350c 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
@@ -48,7 +48,6 @@
 #include <QtLocation/private/qgeomap_p.h>
 
 #include <QtCore/QScopedValueRollback>
-#include <QtGui/private/qtriangulator_p.h>
 #include <QtQml/QQmlInfo>
 #include <QtQml/private/qqmlengine_p.h>
 #include <QPainter>
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
index 6c7dabd2..42fad815 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
@@ -57,7 +57,6 @@
 #include <QPainterPathStroker>
 #include <qnumeric.h>
 
-#include <QtGui/private/qvectorpath_p.h>
 #include <QtGui/private/qtriangulatingstroker_p.h>
 #include <QtGui/private/qtriangulator_p.h>
 
diff --git a/src/location/maps/qgeoroutingmanager_p.h b/src/location/maps/qgeoroutingmanager_p.h
index 16ff6350..c2ce066e 100644
--- a/src/location/maps/qgeoroutingmanager_p.h
+++ b/src/location/maps/qgeoroutingmanager_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/private/qglobal_p.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/places/qplacecontent_p.h b/src/location/places/qplacecontent_p.h
index 598392a1..e0f2df8c 100644
--- a/src/location/places/qplacecontent_p.h
+++ b/src/location/places/qplacecontent_p.h
@@ -58,7 +58,6 @@
 #include <QtCore/QSharedData>
 #include <QtCore/QString>
 #include <QtCore/QUrl>
-#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/places/qplacecontentrequest_p.h b/src/location/places/qplacecontentrequest_p.h
index 154e492a..6ea4c664 100644
--- a/src/location/places/qplacecontentrequest_p.h
+++ b/src/location/places/qplacecontentrequest_p.h
@@ -54,7 +54,7 @@
 #include <QtCore/QSharedData>
 #include <QtCore/QVariant>
 #include <QtLocation/QPlaceContent>
-#include <QtCore/private/qglobal_p.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/places/qplacemanagerengine_p.h b/src/location/places/qplacemanagerengine_p.h
index e87548e2..b93cbd53 100644
--- a/src/location/places/qplacemanagerengine_p.h
+++ b/src/location/places/qplacemanagerengine_p.h
@@ -53,7 +53,7 @@
 
 #include <QtCore/QString>
 #include <QtLocation/QLocation>
-#include <QtCore/private/qglobal_p.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/places/qplacereply_p.h b/src/location/places/qplacereply_p.h
index ec3a28f5..8fe57832 100644
--- a/src/location/places/qplacereply_p.h
+++ b/src/location/places/qplacereply_p.h
@@ -52,7 +52,6 @@
 //
 
 #include "qplacereply.h"
-#include "private/qglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/places/qplacesearchresult_p.h b/src/location/places/qplacesearchresult_p.h
index 918ede20..ff958af2 100644
--- a/src/location/places/qplacesearchresult_p.h
+++ b/src/location/places/qplacesearchresult_p.h
@@ -56,7 +56,6 @@
 
 #include <QSharedData>
 #include <QtLocation/QPlaceIcon>
-#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/places/qplacesupplier_p.h b/src/location/places/qplacesupplier_p.h
index 359a8424..b1172239 100644
--- a/src/location/places/qplacesupplier_p.h
+++ b/src/location/places/qplacesupplier_p.h
@@ -56,7 +56,6 @@
 #include <QUrl>
 
 #include "qplaceicon.h"
-#include "private/qglobal_p.h"
 
 QT_BEGIN_NAMESPACE