Fix export macro in private headers

Changing Q_LOCATION_EXPORT to Q_LOCATION_PRIVATE_EXPORT in all
_p headers to avoid confusion.

Change-Id: Ic42d1c59f0cd68c27bcf40296c612d005da11efd
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

17 files changed, 40 insertions, 39 deletions

diff --git a/src/location/maps/qabstractgeotilecache_p.h b/src/location/maps/qabstractgeotilecache_p.h
index ba4c12de..352c520d 100644
--- a/src/location/maps/qabstractgeotilecache_p.h
+++ b/src/location/maps/qabstractgeotilecache_p.h
@@ -47,7 +47,7 @@
 // We mean it.
 //
 
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 
 #include <QObject>
 #include <QCache>
@@ -71,7 +71,7 @@ class QAbstractGeoTileCache;
 class QThread;
 
 /* This is also used in the mapgeometry */
-class Q_LOCATION_EXPORT QGeoTileTexture
+class Q_LOCATION_PRIVATE_EXPORT QGeoTileTexture
 {
 public:
 
@@ -83,7 +83,7 @@ public:
     bool textureBound;
 };
 
-class Q_LOCATION_EXPORT QAbstractGeoTileCache : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QAbstractGeoTileCache : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/maps/qgeocameratiles_p.h b/src/location/maps/qgeocameratiles_p.h
index 8a26f28a..3ff00688 100644
--- a/src/location/maps/qgeocameratiles_p.h
+++ b/src/location/maps/qgeocameratiles_p.h
@@ -47,7 +47,7 @@
 // We mean it.
 //
 
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
@@ -58,7 +58,7 @@ class QGeoMapType;
 class QGeoCameraTilesPrivate;
 class QSize;
 
-class Q_LOCATION_EXPORT QGeoCameraTiles {
+class Q_LOCATION_PRIVATE_EXPORT QGeoCameraTiles {
 public:
     QGeoCameraTiles();
     ~QGeoCameraTiles();
diff --git a/src/location/maps/qgeofiletilecache_p.h b/src/location/maps/qgeofiletilecache_p.h
index 7ca8cf33..2da7c95f 100644
--- a/src/location/maps/qgeofiletilecache_p.h
+++ b/src/location/maps/qgeofiletilecache_p.h
@@ -47,7 +47,6 @@
 // We mean it.
 //
 
-#include <QtLocation/qlocationglobal.h>
 #include <QtLocation/private/qlocationglobal_p.h>
 
 #include <QObject>
@@ -96,7 +95,7 @@ protected:
     void aboutToBeEvicted(const QGeoTileSpec &key, QSharedPointer<QGeoCachedTileDisk> obj);
 };
 
-class Q_LOCATION_EXPORT QGeoFileTileCache : public QAbstractGeoTileCache
+class Q_LOCATION_PRIVATE_EXPORT QGeoFileTileCache : public QAbstractGeoTileCache
 {
     Q_OBJECT
 public:
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h
index bb8ca9b4..7e2d4bbd 100644
--- a/src/location/maps/qgeomap_p.h
+++ b/src/location/maps/qgeomap_p.h
@@ -47,6 +47,7 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeocameradata_p.h>
 #include <QtLocation/private/qgeomaptype_p.h>
 #include <QtLocation/private/qgeocameracapabilities_p.h>
@@ -65,7 +66,7 @@ class QQuickWindow;
 class QGeoMapParameter;
 class QDeclarativeGeoMapItemBase;
 
-class Q_LOCATION_EXPORT QGeoMap : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QGeoMap : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoMap)
diff --git a/src/location/maps/qgeomapparameter_p.h b/src/location/maps/qgeomapparameter_p.h
index c3bef4d8..bc39c14a 100644
--- a/src/location/maps/qgeomapparameter_p.h
+++ b/src/location/maps/qgeomapparameter_p.h
@@ -51,11 +51,11 @@
 
 #include <QObject>
 #include <QString>
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATION_EXPORT QGeoMapParameter : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QGeoMapParameter : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeomappingmanager_p.h b/src/location/maps/qgeomappingmanager_p.h
index 2ec1e8b5..f536b15b 100644
--- a/src/location/maps/qgeomappingmanager_p.h
+++ b/src/location/maps/qgeomappingmanager_p.h
@@ -51,7 +51,7 @@
 #include <QObject>
 #include <QSize>
 #include <QPair>
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include "qgeomaptype_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -66,7 +66,7 @@ class QGeoMappingManagerEngine;
 class QGeoCameraCapabilities;
 
 
-class Q_LOCATION_EXPORT QGeoMappingManager : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QGeoMappingManager : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h
index fd48d44c..13956141 100644
--- a/src/location/maps/qgeomappingmanagerengine_p.h
+++ b/src/location/maps/qgeomappingmanagerengine_p.h
@@ -56,7 +56,7 @@
 #include <QMap>
 #include <QString>
 #include <QVariant>
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include "qgeomaptype_p.h"
 #include "qgeomappingmanager_p.h"
 
@@ -72,7 +72,7 @@ class QGeoMapRequestOptions;
 class QGeoMappingManagerEnginePrivate;
 class QGeoMap;
 
-class Q_LOCATION_EXPORT QGeoMappingManagerEngine : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QGeoMappingManagerEngine : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeomaptype_p.h b/src/location/maps/qgeomaptype_p.h
index 78c74168..f26471f4 100644
--- a/src/location/maps/qgeomaptype_p.h
+++ b/src/location/maps/qgeomaptype_p.h
@@ -50,13 +50,13 @@
 
 #include <QtCore/QString>
 #include <QtCore/QSharedDataPointer>
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QGeoMapTypePrivate;
 
-class Q_LOCATION_EXPORT QGeoMapType
+class Q_LOCATION_PRIVATE_EXPORT QGeoMapType
 {
 public:
     enum MapStyle {
diff --git a/src/location/maps/qgeorouteparser_p.h b/src/location/maps/qgeorouteparser_p.h
index da1c09f2..3d966d65 100644
--- a/src/location/maps/qgeorouteparser_p.h
+++ b/src/location/maps/qgeorouteparser_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/qgeoroutereply.h>
 #include <QtLocation/qgeorouterequest.h>
 #include <QtCore/QByteArray>
@@ -57,7 +57,7 @@
 QT_BEGIN_NAMESPACE
 
 class QGeoRouteParserPrivate;
-class Q_LOCATION_EXPORT QGeoRouteParser : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParser : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoRouteParser)
diff --git a/src/location/maps/qgeorouteparserosrmv4_p.h b/src/location/maps/qgeorouteparserosrmv4_p.h
index 3d38cbf7..97bb43ea 100644
--- a/src/location/maps/qgeorouteparserosrmv4_p.h
+++ b/src/location/maps/qgeorouteparserosrmv4_p.h
@@ -54,7 +54,7 @@
 QT_BEGIN_NAMESPACE
 
 class QGeoRouteParserOsrmV4Private;
-class Q_LOCATION_EXPORT QGeoRouteParserOsrmV4 : public QGeoRouteParser
+class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserOsrmV4 : public QGeoRouteParser
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoRouteParserOsrmV4)
diff --git a/src/location/maps/qgeorouteparserosrmv5_p.h b/src/location/maps/qgeorouteparserosrmv5_p.h
index 47c68919..d2c59165 100644
--- a/src/location/maps/qgeorouteparserosrmv5_p.h
+++ b/src/location/maps/qgeorouteparserosrmv5_p.h
@@ -54,7 +54,7 @@
 QT_BEGIN_NAMESPACE
 
 class QGeoRouteParserOsrmV5Private;
-class Q_LOCATION_EXPORT QGeoRouteParserOsrmV5 : public QGeoRouteParser
+class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserOsrmV5 : public QGeoRouteParser
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoRouteParserOsrmV5)
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h
index 78461f40..956c4852 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h
@@ -51,7 +51,7 @@
 #include <QObject>
 #include <QSize>
 #include <QPair>
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qabstractgeotilecache_p.h>
 #include <QtLocation/private/qgeomaptype_p.h>
 #include <QtLocation/private/qgeomappingmanagerengine_p.h>
@@ -65,7 +65,7 @@ class QGeoTileTexture;
 class QGeoTileSpec;
 class QGeoTiledMap;
 
-class Q_LOCATION_EXPORT QGeoTiledMappingManagerEngine : public QGeoMappingManagerEngine
+class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMappingManagerEngine : public QGeoMappingManagerEngine
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeotiledmapreply_p.h b/src/location/maps/qgeotiledmapreply_p.h
index fc991bb7..5a2a2462 100644
--- a/src/location/maps/qgeotiledmapreply_p.h
+++ b/src/location/maps/qgeotiledmapreply_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 
 #include <QObject>
 
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 class QGeoTileSpec;
 class QGeoTiledMapReplyPrivate;
 
-class Q_LOCATION_EXPORT QGeoTiledMapReply : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMapReply : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeotiledmapscene_p.h b/src/location/maps/qgeotiledmapscene_p.h
index da7829a3..62e90791 100644
--- a/src/location/maps/qgeotiledmapscene_p.h
+++ b/src/location/maps/qgeotiledmapscene_p.h
@@ -48,7 +48,7 @@
 //
 
 #include <QObject>
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtPositioning/QGeoCoordinate>
 
 QT_BEGIN_NAMESPACE
@@ -61,7 +61,7 @@ class QSGNode;
 class QQuickWindow;
 class QGeoTiledMapScenePrivate;
 
-class Q_LOCATION_EXPORT QGeoTiledMapScene : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMapScene : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoTiledMapScene)
diff --git a/src/location/maps/qgeotilefetcher_p.h b/src/location/maps/qgeotilefetcher_p.h
index 007a919a..f9a84209 100644
--- a/src/location/maps/qgeotilefetcher_p.h
+++ b/src/location/maps/qgeotilefetcher_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QObject>
-#include <qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include "qgeomaptype_p.h"
 #include "qgeotiledmappingmanagerengine_p.h"
 
@@ -62,7 +62,7 @@ class QGeoTiledMappingManagerEngine;
 class QGeoTiledMapReply;
 class QGeoTileSpec;
 
-class Q_LOCATION_EXPORT QGeoTileFetcher : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QGeoTileFetcher : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoTileFetcher)
diff --git a/src/location/maps/qgeotilespec_p.h b/src/location/maps/qgeotilespec_p.h
index b2778241..e0120e93 100644
--- a/src/location/maps/qgeotilespec_p.h
+++ b/src/location/maps/qgeotilespec_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtLocation/qlocationglobal.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtCore/QMetaType>
 #include <QString>
 
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 
 class QGeoTileSpecPrivate;
 
-class Q_LOCATION_EXPORT QGeoTileSpec
+class Q_LOCATION_PRIVATE_EXPORT QGeoTileSpec
 {
 public:
     QGeoTileSpec();
@@ -92,9 +92,9 @@ private:
     QSharedDataPointer<QGeoTileSpecPrivate> d;
 };
 
-Q_LOCATION_EXPORT unsigned int qHash(const QGeoTileSpec &spec);
+Q_LOCATION_PRIVATE_EXPORT unsigned int qHash(const QGeoTileSpec &spec);
 
-Q_LOCATION_EXPORT QDebug operator<<(QDebug, const QGeoTileSpec &);
+Q_LOCATION_PRIVATE_EXPORT QDebug operator<<(QDebug, const QGeoTileSpec &);
 
 QT_END_NAMESPACE
 
diff --git a/src/location/places/unsupportedreplies_p.h b/src/location/places/unsupportedreplies_p.h
index b23a3b34..c1b4160a 100644
--- a/src/location/places/unsupportedreplies_p.h
+++ b/src/location/places/unsupportedreplies_p.h
@@ -48,6 +48,7 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include "qplacedetailsreply.h"
 #include "qplacecontentreply.h"
 #include "qplacesearchreply.h"
@@ -57,7 +58,7 @@
 #include "qplacematchreply.h"
 #include "qplacemanagerengine.h"
 
-class Q_LOCATION_EXPORT QPlaceDetailsReplyUnsupported : public QPlaceDetailsReply
+class Q_LOCATION_PRIVATE_EXPORT QPlaceDetailsReplyUnsupported : public QPlaceDetailsReply
 {
     Q_OBJECT
 
@@ -81,7 +82,7 @@ public:
     }
 };
 
-class Q_LOCATION_EXPORT QPlaceContentReplyUnsupported : public QPlaceContentReply
+class Q_LOCATION_PRIVATE_EXPORT QPlaceContentReplyUnsupported : public QPlaceContentReply
 {
     Q_OBJECT
 
@@ -105,7 +106,7 @@ public:
     }
 };
 
-class Q_LOCATION_EXPORT QPlaceSearchReplyUnsupported : public QPlaceSearchReply
+class Q_LOCATION_PRIVATE_EXPORT QPlaceSearchReplyUnsupported : public QPlaceSearchReply
 {
     Q_OBJECT
 
@@ -129,7 +130,7 @@ public:
     }
 };
 
-class Q_LOCATION_EXPORT QPlaceSearchSuggestionReplyUnsupported : public QPlaceSearchSuggestionReply
+class Q_LOCATION_PRIVATE_EXPORT QPlaceSearchSuggestionReplyUnsupported : public QPlaceSearchSuggestionReply
 {
     Q_OBJECT
 
@@ -153,7 +154,7 @@ public:
     }
 };
 
-class Q_LOCATION_EXPORT QPlaceIdReplyUnsupported : public QPlaceIdReply
+class Q_LOCATION_PRIVATE_EXPORT QPlaceIdReplyUnsupported : public QPlaceIdReply
 {
     Q_OBJECT
 
@@ -177,7 +178,7 @@ public:
     }
 };
 
-class Q_LOCATION_EXPORT QPlaceReplyUnsupported : public QPlaceReply
+class Q_LOCATION_PRIVATE_EXPORT QPlaceReplyUnsupported : public QPlaceReply
 {
     Q_OBJECT
 
@@ -200,7 +201,7 @@ public:
     }
 };
 
-class Q_LOCATION_EXPORT QPlaceMatchReplyUnsupported : public QPlaceMatchReply
+class Q_LOCATION_PRIVATE_EXPORT QPlaceMatchReplyUnsupported : public QPlaceMatchReply
 {
     Q_OBJECT