Remove the use of Q_LOCATION_PRIVATE_EXPORT

Task-number: QTBUG-117983
Change-Id: I4c43f9d3ed970220916b195ed9789ff73c0207e4
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

61 files changed, 93 insertions, 93 deletions

diff --git a/src/location/declarativemaps/qdeclarativegeocodemodel_p.h b/src/location/declarativemaps/qdeclarativegeocodemodel_p.h
index e4bd7739..12f6ea2a 100644
--- a/src/location/declarativemaps/qdeclarativegeocodemodel_p.h
+++ b/src/location/declarativemaps/qdeclarativegeocodemodel_p.h
@@ -34,7 +34,7 @@ class QGeoServiceProvider;
 class QGeoCodingManager;
 class QDeclarativeGeoLocation;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeocodeModel : public QAbstractListModel, public QQmlParserStatus
+class Q_LOCATION_EXPORT QDeclarativeGeocodeModel : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(GeocodeModel)
diff --git a/src/location/declarativemaps/qdeclarativegeojsondata_p.h b/src/location/declarativemaps/qdeclarativegeojsondata_p.h
index a20ec4dd..4831b4fd 100644
--- a/src/location/declarativemaps/qdeclarativegeojsondata_p.h
+++ b/src/location/declarativemaps/qdeclarativegeojsondata_p.h
@@ -34,7 +34,7 @@
 QT_BEGIN_NAMESPACE
 
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoJsonData : public QObject
+class Q_LOCATION_EXPORT QDeclarativeGeoJsonData : public QObject
 {
     Q_OBJECT
     QML_ADDED_IN_VERSION(6, 7)
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
index 95bd4924..e46691d2 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
@@ -36,7 +36,7 @@ class QGeoRoutingManager;
 class QDeclarativeGeoRoute;
 class QDeclarativeGeoRouteQuery;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRouteModel : public QAbstractListModel, public QQmlParserStatus
+class Q_LOCATION_EXPORT QDeclarativeGeoRouteModel : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(RouteModel)
@@ -151,7 +151,7 @@ private:
     RouteError error_ = QDeclarativeGeoRouteModel::NoError;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRouteQuery : public QObject, public QQmlParserStatus
+class Q_LOCATION_EXPORT QDeclarativeGeoRouteQuery : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(RouteQuery)
diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
index 2a24ed39..cf5ae6a8 100644
--- a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
@@ -40,7 +40,7 @@ class QDeclarativePluginParameterForeign
     QML_NAMED_ELEMENT(PluginParameter)
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoServiceProvider : public QObject, public QQmlParserStatus
+class Q_LOCATION_EXPORT QDeclarativeGeoServiceProvider : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(Plugin)
@@ -192,7 +192,7 @@ private:
     Q_DISABLE_COPY(QDeclarativeGeoServiceProvider)
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoServiceProviderRequirements : public QObject
+class Q_LOCATION_EXPORT QDeclarativeGeoServiceProviderRequirements : public QObject
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(PluginRequirements)
diff --git a/src/location/declarativeplaces/qdeclarativecategory_p.h b/src/location/declarativeplaces/qdeclarativecategory_p.h
index a10e7a7e..0af2a6c5 100644
--- a/src/location/declarativeplaces/qdeclarativecategory_p.h
+++ b/src/location/declarativeplaces/qdeclarativecategory_p.h
@@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE
 class QPlaceReply;
 class QPlaceManager;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCategory : public QObject, public QQmlParserStatus
+class Q_LOCATION_EXPORT QDeclarativeCategory : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(Category)
diff --git a/src/location/declarativeplaces/qdeclarativecontactdetails_p.h b/src/location/declarativeplaces/qdeclarativecontactdetails_p.h
index 66a829b6..002486c9 100644
--- a/src/location/declarativeplaces/qdeclarativecontactdetails_p.h
+++ b/src/location/declarativeplaces/qdeclarativecontactdetails_p.h
@@ -21,7 +21,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeContactDetails : public QQmlPropertyMap
+class Q_LOCATION_EXPORT QDeclarativeContactDetails : public QQmlPropertyMap
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(ContactDetails)
diff --git a/src/location/declarativeplaces/qdeclarativeplace_p.h b/src/location/declarativeplaces/qdeclarativeplace_p.h
index 63b8dff6..01e14cb7 100644
--- a/src/location/declarativeplaces/qdeclarativeplace_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplace_p.h
@@ -35,7 +35,7 @@ class QPlaceManager;
 class QPlaceSupplier;
 class QDeclarativeContactDetails;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlace : public QObject, public QQmlParserStatus
+class Q_LOCATION_EXPORT QDeclarativePlace : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(Place)
diff --git a/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h b/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h
index b32bf6ae..ff27872c 100644
--- a/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h
@@ -31,7 +31,7 @@ class QDeclarativePlace;
 class QDeclarativeGeoServiceProvider;
 class QGeoServiceProvider;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceContentModel : public QAbstractListModel, public QQmlParserStatus
+class Q_LOCATION_EXPORT QDeclarativePlaceContentModel : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
 
diff --git a/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h b/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h
index 4c3b01c5..42515ef2 100644
--- a/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h
+++ b/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h
@@ -30,7 +30,7 @@ class QPlaceSearchRequest;
 class QPlaceSearchReply;
 class QDeclarativePlace;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSearchModelBase : public QAbstractListModel, public QQmlParserStatus
+class Q_LOCATION_EXPORT QDeclarativeSearchModelBase : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
 
diff --git a/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h b/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
index 1d6e248b..cd972045 100644
--- a/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 class QPlaceIcon;
 class QDeclarativeGeoServiceProvider;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSearchResultModel : public QDeclarativeSearchModelBase
+class Q_LOCATION_EXPORT QDeclarativeSearchResultModel : public QDeclarativeSearchModelBase
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(PlaceSearchModel)
diff --git a/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
index 97d87087..ca2c118c 100644
--- a/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeGeoServiceProvider;
 class QGeoServiceProvider;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSearchSuggestionModel : public QDeclarativeSearchModelBase
+class Q_LOCATION_EXPORT QDeclarativeSearchSuggestionModel : public QDeclarativeSearchModelBase
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(PlaceSearchSuggestionModel)
diff --git a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
index 9a7f275a..abaff11a 100644
--- a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
@@ -35,7 +35,7 @@ class QGeoServiceProvider;
 class QPlaceManager;
 class QPlaceReply;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSupportedCategoriesModel : public QAbstractItemModel, public QQmlParserStatus
+class Q_LOCATION_EXPORT QDeclarativeSupportedCategoriesModel : public QAbstractItemModel, public QQmlParserStatus
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(CategoryModel)
diff --git a/src/location/maps/qabstractgeotilecache_p.h b/src/location/maps/qabstractgeotilecache_p.h
index 0cc85ad0..254ad352 100644
--- a/src/location/maps/qabstractgeotilecache_p.h
+++ b/src/location/maps/qabstractgeotilecache_p.h
@@ -42,7 +42,7 @@ struct QGeoTileTexture
     bool textureBound = false;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QAbstractGeoTileCache : public QObject
+class Q_LOCATION_EXPORT QAbstractGeoTileCache : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/maps/qgeocameracapabilities_p.h b/src/location/maps/qgeocameracapabilities_p.h
index f4721e51..5d657e6a 100644
--- a/src/location/maps/qgeocameracapabilities_p.h
+++ b/src/location/maps/qgeocameracapabilities_p.h
@@ -23,9 +23,9 @@
 QT_BEGIN_NAMESPACE
 
 class QGeoCameraCapabilitiesPrivate;
-QT_DECLARE_QSDP_SPECIALIZATION_DTOR_WITH_EXPORT(QGeoCameraCapabilitiesPrivate, Q_LOCATION_PRIVATE_EXPORT)
+QT_DECLARE_QSDP_SPECIALIZATION_DTOR_WITH_EXPORT(QGeoCameraCapabilitiesPrivate, Q_LOCATION_EXPORT)
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoCameraCapabilities
+class Q_LOCATION_EXPORT QGeoCameraCapabilities
 {
     Q_GADGET
 
diff --git a/src/location/maps/qgeocameradata_p.h b/src/location/maps/qgeocameradata_p.h
index 4647a6e6..5025db7a 100644
--- a/src/location/maps/qgeocameradata_p.h
+++ b/src/location/maps/qgeocameradata_p.h
@@ -23,9 +23,9 @@ QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoCameraDataPrivate;
-QT_DECLARE_QSDP_SPECIALIZATION_DTOR_WITH_EXPORT(QGeoCameraDataPrivate, Q_LOCATION_PRIVATE_EXPORT)
+QT_DECLARE_QSDP_SPECIALIZATION_DTOR_WITH_EXPORT(QGeoCameraDataPrivate, Q_LOCATION_EXPORT)
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoCameraData
+class Q_LOCATION_EXPORT QGeoCameraData
 {
 public:
     QGeoCameraData();
diff --git a/src/location/maps/qgeocameratiles_p.h b/src/location/maps/qgeocameratiles_p.h
index 3d42bcca..f432c2f3 100644
--- a/src/location/maps/qgeocameratiles_p.h
+++ b/src/location/maps/qgeocameratiles_p.h
@@ -28,7 +28,7 @@ class QGeoCameraTilesPrivate;
 class QSize;
 class QRectF;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoCameraTiles {
+class Q_LOCATION_EXPORT QGeoCameraTiles {
 public:
     QGeoCameraTiles();
     ~QGeoCameraTiles();
diff --git a/src/location/maps/qgeocameratiles_p_p.h b/src/location/maps/qgeocameratiles_p_p.h
index b2edfe12..4a5be787 100644
--- a/src/location/maps/qgeocameratiles_p_p.h
+++ b/src/location/maps/qgeocameratiles_p_p.h
@@ -28,7 +28,7 @@
 
 QT_BEGIN_NAMESPACE
 
-struct Q_LOCATION_PRIVATE_EXPORT Frustum
+struct Q_LOCATION_EXPORT Frustum
 {
     QDoubleVector3D apex;
     QDoubleVector3D topLeftNear;
@@ -43,7 +43,7 @@ struct Q_LOCATION_PRIVATE_EXPORT Frustum
 
 typedef QList<QDoubleVector3D> PolygonVector;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoCameraTilesPrivate
+class Q_LOCATION_EXPORT QGeoCameraTilesPrivate
 {
 public:
     struct ClippedFootprint
diff --git a/src/location/maps/qgeocodereply_p.h b/src/location/maps/qgeocodereply_p.h
index 375c5672..2bd3805b 100644
--- a/src/location/maps/qgeocodereply_p.h
+++ b/src/location/maps/qgeocodereply_p.h
@@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE
 
 class QGeoLocation;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoCodeReplyPrivate
+class Q_LOCATION_EXPORT QGeoCodeReplyPrivate
 {
 public:
     QGeoCodeReplyPrivate();
diff --git a/src/location/maps/qgeofiletilecache_p.h b/src/location/maps/qgeofiletilecache_p.h
index 914e9d51..eae74823 100644
--- a/src/location/maps/qgeofiletilecache_p.h
+++ b/src/location/maps/qgeofiletilecache_p.h
@@ -46,14 +46,14 @@ public:
 
 /* Custom eviction policy for the disk cache, to avoid deleting all the files
  * when the application closes */
-class Q_LOCATION_PRIVATE_EXPORT QCache3QTileEvictionPolicy : public QCache3QDefaultEvictionPolicy<QGeoTileSpec,QGeoCachedTileDisk>
+class Q_LOCATION_EXPORT QCache3QTileEvictionPolicy : public QCache3QDefaultEvictionPolicy<QGeoTileSpec,QGeoCachedTileDisk>
 {
 protected:
     void aboutToBeRemoved(const QGeoTileSpec &key, QSharedPointer<QGeoCachedTileDisk> obj);
     void aboutToBeEvicted(const QGeoTileSpec &key, QSharedPointer<QGeoCachedTileDisk> obj);
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoFileTileCache : public QAbstractGeoTileCache
+class Q_LOCATION_EXPORT QGeoFileTileCache : public QAbstractGeoTileCache
 {
     Q_OBJECT
 public:
diff --git a/src/location/maps/qgeojson_p.h b/src/location/maps/qgeojson_p.h
index b99e2564..4f1d325e 100644
--- a/src/location/maps/qgeojson_p.h
+++ b/src/location/maps/qgeojson_p.h
@@ -26,14 +26,14 @@ class QString;
 
 namespace QGeoJson {
     // This method imports a GeoJSON file to a QVariantList
-    Q_LOCATION_PRIVATE_EXPORT QVariantList importGeoJson(const QJsonDocument &doc);
+    Q_LOCATION_EXPORT QVariantList importGeoJson(const QJsonDocument &doc);
 
     // This method exports a GeoJSON file from a QVariantList
-    Q_LOCATION_PRIVATE_EXPORT QJsonDocument exportGeoJson(const QVariantList &list);
+    Q_LOCATION_EXPORT QJsonDocument exportGeoJson(const QVariantList &list);
 
     // This method exports the content of the imported QVariantList in a
     // readable format
-    Q_LOCATION_PRIVATE_EXPORT QString toString(const QVariantList &importedGeoJson);
+    Q_LOCATION_EXPORT QString toString(const QVariantList &importedGeoJson);
 }
 
 QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h
index 5860e071..2d9ea0b6 100644
--- a/src/location/maps/qgeomap_p.h
+++ b/src/location/maps/qgeomap_p.h
@@ -35,7 +35,7 @@ class QQuickWindow;
 class QDeclarativeGeoMapItemBase;
 class QDeclarativeGeoMap;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoMap : public QObject
+class Q_LOCATION_EXPORT QGeoMap : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoMap)
diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h
index ffc0dcfa..05e1c5d2 100644
--- a/src/location/maps/qgeomap_p_p.h
+++ b/src/location/maps/qgeomap_p_p.h
@@ -33,7 +33,7 @@ class QGeoMap;
 class QGeoMapController;
 class QDeclarativeGeoMapItemBase;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoMapPrivate :  public QObjectPrivate
+class Q_LOCATION_EXPORT QGeoMapPrivate :  public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QGeoMap)
 public:
diff --git a/src/location/maps/qgeomappingmanager_p.h b/src/location/maps/qgeomappingmanager_p.h
index 1d521b1e..4d96db0c 100644
--- a/src/location/maps/qgeomappingmanager_p.h
+++ b/src/location/maps/qgeomappingmanager_p.h
@@ -31,7 +31,7 @@ class QGeoMappingManagerEngine;
 class QGeoCameraCapabilities;
 
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoMappingManager : public QObject
+class Q_LOCATION_EXPORT QGeoMappingManager : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h
index 6fa4ee3d..b703efe0 100644
--- a/src/location/maps/qgeomappingmanagerengine_p.h
+++ b/src/location/maps/qgeomappingmanagerengine_p.h
@@ -34,7 +34,7 @@ class QGeoMappingManagerEnginePrivate;
 class QGeoMap;
 class QGeoMapType;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoMappingManagerEngine : public QObject
+class Q_LOCATION_EXPORT QGeoMappingManagerEngine : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeomaptype_p.h b/src/location/maps/qgeomaptype_p.h
index 863c65d3..cf8e97d5 100644
--- a/src/location/maps/qgeomaptype_p.h
+++ b/src/location/maps/qgeomaptype_p.h
@@ -26,9 +26,9 @@ QT_BEGIN_NAMESPACE
 
 class QGeoCameraCapabilities;
 class QGeoMapTypePrivate;
-QT_DECLARE_QSDP_SPECIALIZATION_DTOR_WITH_EXPORT(QGeoMapTypePrivate, Q_LOCATION_PRIVATE_EXPORT)
+QT_DECLARE_QSDP_SPECIALIZATION_DTOR_WITH_EXPORT(QGeoMapTypePrivate, Q_LOCATION_EXPORT)
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoMapType
+class Q_LOCATION_EXPORT QGeoMapType
 {
     Q_GADGET
     QML_VALUE_TYPE(mapType)
diff --git a/src/location/maps/qgeoprojection_p.h b/src/location/maps/qgeoprojection_p.h
index 7b0ddf2b..1bfab3c8 100644
--- a/src/location/maps/qgeoprojection_p.h
+++ b/src/location/maps/qgeoprojection_p.h
@@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE
 class QGeoShape;
 class QGeoRectangle;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoProjection
+class Q_LOCATION_EXPORT QGeoProjection
 {
 public:
     enum ProjectionGroup {
@@ -92,7 +92,7 @@ public:
     mutable bool     m_qsgTransformDirty = true;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoProjectionWebMercator : public QGeoProjection
+class Q_LOCATION_EXPORT QGeoProjectionWebMercator : public QGeoProjection
 {
 public:
     QGeoProjectionWebMercator();
diff --git a/src/location/maps/qgeoroute_p.h b/src/location/maps/qgeoroute_p.h
index 84eb6dcd..98d6575f 100644
--- a/src/location/maps/qgeoroute_p.h
+++ b/src/location/maps/qgeoroute_p.h
@@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoRoutePrivate : public QSharedData
+class Q_LOCATION_EXPORT QGeoRoutePrivate : public QSharedData
 {
 public:
     bool operator==(const QGeoRoutePrivate &other) const;
diff --git a/src/location/maps/qgeorouteparser_p.h b/src/location/maps/qgeorouteparser_p.h
index a650495b..89f515af 100644
--- a/src/location/maps/qgeorouteparser_p.h
+++ b/src/location/maps/qgeorouteparser_p.h
@@ -24,7 +24,7 @@ class QByteArray;
 class QUrl;
 class QGeoRouteRequest;
 class QGeoRouteParserPrivate;
-class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParser : public QObject
+class Q_LOCATION_EXPORT QGeoRouteParser : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoRouteParser)
diff --git a/src/location/maps/qgeorouteparser_p_p.h b/src/location/maps/qgeorouteparser_p_p.h
index 389f8b40..21fa8866 100644
--- a/src/location/maps/qgeorouteparser_p_p.h
+++ b/src/location/maps/qgeorouteparser_p_p.h
@@ -22,7 +22,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserPrivate :  public QObjectPrivate
+class Q_LOCATION_EXPORT QGeoRouteParserPrivate :  public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QGeoRouteParser)
 public:
diff --git a/src/location/maps/qgeorouteparserosrmv5_p.h b/src/location/maps/qgeorouteparserosrmv5_p.h
index 4783f4ca..ca9b2290 100644
--- a/src/location/maps/qgeorouteparserosrmv5_p.h
+++ b/src/location/maps/qgeorouteparserosrmv5_p.h
@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
 
 class QGeoRouteParserOsrmV5Private;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserOsrmV5Extension
+class Q_LOCATION_EXPORT QGeoRouteParserOsrmV5Extension
 {
 public:
     QGeoRouteParserOsrmV5Extension()
@@ -38,7 +38,7 @@ public:
     virtual void updateSegment(QGeoRouteSegment &segment, const QJsonObject &step, const QJsonObject &maneuver) const = 0;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserOsrmV5 : public QGeoRouteParser
+class Q_LOCATION_EXPORT QGeoRouteParserOsrmV5 : public QGeoRouteParser
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoRouteParserOsrmV5)
diff --git a/src/location/maps/qgeoroutesegment_p.h b/src/location/maps/qgeoroutesegment_p.h
index f270711a..37e5b8d5 100644
--- a/src/location/maps/qgeoroutesegment_p.h
+++ b/src/location/maps/qgeoroutesegment_p.h
@@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoRouteSegmentPrivate : public QSharedData
+class Q_LOCATION_EXPORT QGeoRouteSegmentPrivate : public QSharedData
 {
 public:
     QGeoRouteSegmentPrivate();
diff --git a/src/location/maps/qgeotiledmap_p.h b/src/location/maps/qgeotiledmap_p.h
index 086a550f..67961206 100644
--- a/src/location/maps/qgeotiledmap_p.h
+++ b/src/location/maps/qgeotiledmap_p.h
@@ -33,7 +33,7 @@ class QSGNode;
 
 class QPointF;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMap : public QGeoMap
+class Q_LOCATION_EXPORT QGeoTiledMap : public QGeoMap
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoTiledMap)
diff --git a/src/location/maps/qgeotiledmap_p_p.h b/src/location/maps/qgeotiledmap_p_p.h
index 3a4363ef..46899652 100644
--- a/src/location/maps/qgeotiledmap_p_p.h
+++ b/src/location/maps/qgeotiledmap_p_p.h
@@ -36,7 +36,7 @@ class QSGNode;
 class QQuickWindow;
 class QGeoCameraCapabilities;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMapPrivate : public QGeoMapPrivate
+class Q_LOCATION_EXPORT QGeoTiledMapPrivate : public QGeoMapPrivate
 {
     Q_DECLARE_PUBLIC(QGeoTiledMap)
 public:
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h
index d4cd57db..1538ba2f 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h
@@ -30,7 +30,7 @@ struct QGeoTileTexture;
 class QGeoTileSpec;
 class QSize;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMappingManagerEngine : public QGeoMappingManagerEngine
+class Q_LOCATION_EXPORT QGeoTiledMappingManagerEngine : public QGeoMappingManagerEngine
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeotiledmapreply_p.h b/src/location/maps/qgeotiledmapreply_p.h
index aa251c9a..e1a4eee8 100644
--- a/src/location/maps/qgeotiledmapreply_p.h
+++ b/src/location/maps/qgeotiledmapreply_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 class QGeoTileSpec;
 class QGeoTiledMapReplyPrivate;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMapReply : public QObject
+class Q_LOCATION_EXPORT QGeoTiledMapReply : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeotiledmapscene_p.h b/src/location/maps/qgeotiledmapscene_p.h
index e1ad7458..f14ec2ba 100644
--- a/src/location/maps/qgeotiledmapscene_p.h
+++ b/src/location/maps/qgeotiledmapscene_p.h
@@ -27,7 +27,7 @@ class QSGNode;
 class QQuickWindow;
 class QGeoTiledMapScenePrivate;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMapScene : public QObject
+class Q_LOCATION_EXPORT QGeoTiledMapScene : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoTiledMapScene)
diff --git a/src/location/maps/qgeotiledmapscene_p_p.h b/src/location/maps/qgeotiledmapscene_p_p.h
index db6855d5..8c0b3822 100644
--- a/src/location/maps/qgeotiledmapscene_p_p.h
+++ b/src/location/maps/qgeotiledmapscene_p_p.h
@@ -26,7 +26,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMapTileContainerNode : public QSGTransformNode
+class Q_LOCATION_EXPORT QGeoTiledMapTileContainerNode : public QSGTransformNode
 {
 public:
     void addChild(const QGeoTileSpec &spec, QSGImageNode *node)
@@ -37,7 +37,7 @@ public:
     QHash<QGeoTileSpec, QSGImageNode *> tiles;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMapRootNode : public QSGClipNode
+class Q_LOCATION_EXPORT QGeoTiledMapRootNode : public QSGClipNode
 {
 public:
     QGeoTiledMapRootNode()
@@ -95,7 +95,7 @@ public:
 #endif
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMapScenePrivate : public QObjectPrivate
+class Q_LOCATION_EXPORT QGeoTiledMapScenePrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QGeoTiledMapScene)
 public:
diff --git a/src/location/maps/qgeotilefetcher_p.h b/src/location/maps/qgeotilefetcher_p.h
index 6012beac..267c254e 100644
--- a/src/location/maps/qgeotilefetcher_p.h
+++ b/src/location/maps/qgeotilefetcher_p.h
@@ -27,7 +27,7 @@ class QGeoTiledMappingManagerEngine;
 class QGeoTiledMapReply;
 class QGeoTileSpec;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTileFetcher : public QObject
+class Q_LOCATION_EXPORT QGeoTileFetcher : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoTileFetcher)
diff --git a/src/location/maps/qgeotilefetcher_p_p.h b/src/location/maps/qgeotilefetcher_p_p.h
index 83fa0d41..b64ba901 100644
--- a/src/location/maps/qgeotilefetcher_p_p.h
+++ b/src/location/maps/qgeotilefetcher_p_p.h
@@ -34,7 +34,7 @@ class QGeoTileSpec;
 class QGeoTiledMapReply;
 class QGeoMappingManagerEngine;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTileFetcherPrivate : public QObjectPrivate
+class Q_LOCATION_EXPORT QGeoTileFetcherPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QGeoTileFetcher)
 public:
diff --git a/src/location/maps/qgeotilerequestmanager_p.h b/src/location/maps/qgeotilerequestmanager_p.h
index 86311181..145bd899 100644
--- a/src/location/maps/qgeotilerequestmanager_p.h
+++ b/src/location/maps/qgeotilerequestmanager_p.h
@@ -26,7 +26,7 @@ struct QGeoTileTexture;
 
 class QGeoTileRequestManagerPrivate;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTileRequestManager
+class Q_LOCATION_EXPORT QGeoTileRequestManager
 {
 public:
     explicit QGeoTileRequestManager(QGeoTiledMap *map, QGeoTiledMappingManagerEngine *engine);
diff --git a/src/location/maps/qgeotilespec_p.h b/src/location/maps/qgeotilespec_p.h
index 3d0ac578..e8bc0618 100644
--- a/src/location/maps/qgeotilespec_p.h
+++ b/src/location/maps/qgeotilespec_p.h
@@ -26,9 +26,9 @@
 QT_BEGIN_NAMESPACE
 
 class QGeoTileSpecPrivate;
-QT_DECLARE_QSDP_SPECIALIZATION_DTOR_WITH_EXPORT(QGeoTileSpecPrivate, Q_LOCATION_PRIVATE_EXPORT)
+QT_DECLARE_QSDP_SPECIALIZATION_DTOR_WITH_EXPORT(QGeoTileSpecPrivate, Q_LOCATION_EXPORT)
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoTileSpec
+class Q_LOCATION_EXPORT QGeoTileSpec
 {
 public:
     QGeoTileSpec();
@@ -73,9 +73,9 @@ private:
     bool isLess(const QGeoTileSpec &rhs) const noexcept;
 };
 
-Q_LOCATION_PRIVATE_EXPORT unsigned int qHash(const QGeoTileSpec &spec);
+Q_LOCATION_EXPORT unsigned int qHash(const QGeoTileSpec &spec);
 
-Q_LOCATION_PRIVATE_EXPORT QDebug operator<<(QDebug, const QGeoTileSpec &);
+Q_LOCATION_EXPORT QDebug operator<<(QDebug, const QGeoTileSpec &);
 
 QT_END_NAMESPACE
 
diff --git a/src/location/places/qplace_p.h b/src/location/places/qplace_p.h
index d46c9e2a..332efbb5 100644
--- a/src/location/places/qplace_p.h
+++ b/src/location/places/qplace_p.h
@@ -33,7 +33,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATION_PRIVATE_EXPORT QPlacePrivate : public QSharedData
+class Q_LOCATION_EXPORT QPlacePrivate : public QSharedData
 {
 public:
     QPlacePrivate();
@@ -83,7 +83,7 @@ public:
 };
 
 
-class Q_LOCATION_PRIVATE_EXPORT QPlacePrivateDefault : public QPlacePrivate
+class Q_LOCATION_EXPORT QPlacePrivateDefault : public QPlacePrivate
 {
 public:
     QPlacePrivateDefault();
diff --git a/src/location/places/qplacesearchrequest_p.h b/src/location/places/qplacesearchrequest_p.h
index 66408533..0a609f33 100644
--- a/src/location/places/qplacesearchrequest_p.h
+++ b/src/location/places/qplacesearchrequest_p.h
@@ -27,7 +27,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATION_PRIVATE_EXPORT QPlaceSearchRequestPrivate : public QSharedData
+class Q_LOCATION_EXPORT QPlaceSearchRequestPrivate : public QSharedData
 {
 public:
     bool operator==(const QPlaceSearchRequestPrivate &other) const;
diff --git a/src/location/places/unsupportedreplies_p.h b/src/location/places/unsupportedreplies_p.h
index dfb12d1a..d2ead592 100644
--- a/src/location/places/unsupportedreplies_p.h
+++ b/src/location/places/unsupportedreplies_p.h
@@ -25,7 +25,7 @@
 #include "qplacematchreply.h"
 #include "qplacemanagerengine.h"
 
-class Q_LOCATION_PRIVATE_EXPORT QPlaceDetailsReplyUnsupported : public QPlaceDetailsReply
+class Q_LOCATION_EXPORT QPlaceDetailsReplyUnsupported : public QPlaceDetailsReply
 {
     Q_OBJECT
 
@@ -49,7 +49,7 @@ public:
     }
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QPlaceContentReplyUnsupported : public QPlaceContentReply
+class Q_LOCATION_EXPORT QPlaceContentReplyUnsupported : public QPlaceContentReply
 {
     Q_OBJECT
 
@@ -73,7 +73,7 @@ public:
     }
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QPlaceSearchReplyUnsupported : public QPlaceSearchReply
+class Q_LOCATION_EXPORT QPlaceSearchReplyUnsupported : public QPlaceSearchReply
 {
     Q_OBJECT
 
@@ -97,7 +97,7 @@ public:
     }
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QPlaceSearchSuggestionReplyUnsupported : public QPlaceSearchSuggestionReply
+class Q_LOCATION_EXPORT QPlaceSearchSuggestionReplyUnsupported : public QPlaceSearchSuggestionReply
 {
     Q_OBJECT
 
@@ -121,7 +121,7 @@ public:
     }
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QPlaceIdReplyUnsupported : public QPlaceIdReply
+class Q_LOCATION_EXPORT QPlaceIdReplyUnsupported : public QPlaceIdReply
 {
     Q_OBJECT
 
@@ -145,7 +145,7 @@ public:
     }
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QPlaceReplyUnsupported : public QPlaceReply
+class Q_LOCATION_EXPORT QPlaceReplyUnsupported : public QPlaceReply
 {
     Q_OBJECT
 
@@ -168,7 +168,7 @@ public:
     }
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QPlaceMatchReplyUnsupported : public QPlaceMatchReply
+class Q_LOCATION_EXPORT QPlaceMatchReplyUnsupported : public QPlaceMatchReply
 {
     Q_OBJECT
 
diff --git a/src/location/qlocationglobal_p.h b/src/location/qlocationglobal_p.h
index 33ed3d07..00935fc3 100644
--- a/src/location/qlocationglobal_p.h
+++ b/src/location/qlocationglobal_p.h
@@ -18,13 +18,13 @@
 #include "qlocationglobal.h"
 #include <qqml.h>
 #include "private/qglobal_p.h"
-#include <QtLocation/private/qtlocationexports_p.h>
+#include <QtLocation/qtlocationexports.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace QLocation
 {
-Q_NAMESPACE_EXPORT(Q_LOCATION_PRIVATE_EXPORT)
+Q_NAMESPACE_EXPORT(Q_LOCATION_EXPORT)
 QML_NAMED_ELEMENT(QtLocation)
 QML_ADDED_IN_VERSION(6, 6)
 Q_CLASSINFO("RegisterEnumClassesUnscoped", "false")
diff --git a/src/location/quickmapitems/qdeclarativecirclemapitem_p.h b/src/location/quickmapitems/qdeclarativecirclemapitem_p.h
index 305fd719..1bb44a6d 100644
--- a/src/location/quickmapitems/qdeclarativecirclemapitem_p.h
+++ b/src/location/quickmapitems/qdeclarativecirclemapitem_p.h
@@ -25,7 +25,7 @@
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeCircleMapItemPrivate;
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItem : public QDeclarativeGeoMapItemBase
+class Q_LOCATION_EXPORT QDeclarativeCircleMapItem : public QDeclarativeGeoMapItemBase
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(MapCircle)
diff --git a/src/location/quickmapitems/qdeclarativecirclemapitem_p_p.h b/src/location/quickmapitems/qdeclarativecirclemapitem_p_p.h
index ee6e8d57..a5e0f41f 100644
--- a/src/location/quickmapitems/qdeclarativecirclemapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativecirclemapitem_p_p.h
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 class QQuickShape;
 class QQuickShapePath;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoMapCircleGeometry : public QGeoMapPolygonGeometry
+class Q_LOCATION_EXPORT QGeoMapCircleGeometry : public QGeoMapPolygonGeometry
 {
 public:
     QGeoMapCircleGeometry();
@@ -33,7 +33,7 @@ public:
     void updateSourceAndScreenPointsInvert(const QList<QDoubleVector2D> &circlePath, const QGeoMap &map);
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivate
+class Q_LOCATION_EXPORT QDeclarativeCircleMapItemPrivate
 {
     Q_DISABLE_COPY_MOVE(QDeclarativeCircleMapItemPrivate)
 public:
@@ -83,7 +83,7 @@ public:
     QList<QDoubleVector2D> m_circlePath;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivateCPU: public QDeclarativeCircleMapItemPrivate
+class Q_LOCATION_EXPORT QDeclarativeCircleMapItemPrivateCPU: public QDeclarativeCircleMapItemPrivate
 {
 public:
     QDeclarativeCircleMapItemPrivateCPU(QDeclarativeCircleMapItem &circle);
diff --git a/src/location/quickmapitems/qdeclarativegeomap_p.h b/src/location/quickmapitems/qdeclarativegeomap_p.h
index 094f480f..5404f187 100644
--- a/src/location/quickmapitems/qdeclarativegeomap_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomap_p.h
@@ -37,7 +37,7 @@ class QDeclarativeGeoServiceProvider;
 class QGeoMapType;
 class QDeclarativeGeoMapCopyrightNotice;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMap : public QQuickItem
+class Q_LOCATION_EXPORT QDeclarativeGeoMap : public QQuickItem
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(Map)
diff --git a/src/location/quickmapitems/qdeclarativegeomapcopyrightsnotice_p.h b/src/location/quickmapitems/qdeclarativegeomapcopyrightsnotice_p.h
index c9c81ca1..e37a2f62 100644
--- a/src/location/quickmapitems/qdeclarativegeomapcopyrightsnotice_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapcopyrightsnotice_p.h
@@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE
 class QTextDocument;
 class QDeclarativeGeoMap;
 class QDeclarativeGeoMapCopyrightNoticePrivate;
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapCopyrightNotice : public QQuickPaintedItem
+class Q_LOCATION_EXPORT QDeclarativeGeoMapCopyrightNotice : public QQuickPaintedItem
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(MapCopyrightNotice)
diff --git a/src/location/quickmapitems/qdeclarativegeomapitembase_p.h b/src/location/quickmapitems/qdeclarativegeomapitembase_p.h
index 9f2de62b..14bec931 100644
--- a/src/location/quickmapitems/qdeclarativegeomapitembase_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapitembase_p.h
@@ -30,7 +30,7 @@
 
 QT_BEGIN_NAMESPACE
 
-struct Q_LOCATION_PRIVATE_EXPORT QGeoMapViewportChangeEvent
+struct Q_LOCATION_EXPORT QGeoMapViewportChangeEvent
 {
     QGeoCameraData cameraData;
     QSizeF mapSize;
@@ -43,7 +43,7 @@ struct Q_LOCATION_PRIVATE_EXPORT QGeoMapViewportChangeEvent
     bool rollChanged = false;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapItemBase : public QQuickItem
+class Q_LOCATION_EXPORT QDeclarativeGeoMapItemBase : public QQuickItem
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(GeoMapItemBase)
diff --git a/src/location/quickmapitems/qdeclarativegeomapitemgroup_p.h b/src/location/quickmapitems/qdeclarativegeomapitemgroup_p.h
index 02626071..556cb0a4 100644
--- a/src/location/quickmapitems/qdeclarativegeomapitemgroup_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapitemgroup_p.h
@@ -22,7 +22,7 @@
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMap;
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapItemGroup : public QQuickItem
+class Q_LOCATION_EXPORT QDeclarativeGeoMapItemGroup : public QQuickItem
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(MapItemGroup)
diff --git a/src/location/quickmapitems/qdeclarativegeomapitemview_p.h b/src/location/quickmapitems/qdeclarativegeomapitemview_p.h
index 2676e982..4b4078ee 100644
--- a/src/location/quickmapitems/qdeclarativegeomapitemview_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapitemview_p.h
@@ -40,7 +40,7 @@ class QDeclarativeGeoMapItemViewItemData;
 class QDeclarativeGeoMapItemView;
 class QDeclarativeGeoMapItemGroup;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapItemView : public QDeclarativeGeoMapItemGroup
+class Q_LOCATION_EXPORT QDeclarativeGeoMapItemView : public QDeclarativeGeoMapItemGroup
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(MapItemView)
diff --git a/src/location/quickmapitems/qdeclarativegeomapquickitem_p.h b/src/location/quickmapitems/qdeclarativegeomapquickitem_p.h
index b4c15ca2..67d6e39c 100644
--- a/src/location/quickmapitems/qdeclarativegeomapquickitem_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapquickitem_p.h
@@ -37,7 +37,7 @@ public:
     QMatrix4x4 m_matrix;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapQuickItem : public QDeclarativeGeoMapItemBase
+class Q_LOCATION_EXPORT QDeclarativeGeoMapQuickItem : public QDeclarativeGeoMapItemBase
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(MapQuickItem)
diff --git a/src/location/quickmapitems/qdeclarativepolygonmapitem_p.h b/src/location/quickmapitems/qdeclarativepolygonmapitem_p.h
index 1a99983d..92703cd4 100644
--- a/src/location/quickmapitems/qdeclarativepolygonmapitem_p.h
+++ b/src/location/quickmapitems/qdeclarativepolygonmapitem_p.h
@@ -23,7 +23,7 @@
 QT_BEGIN_NAMESPACE
 
 class QDeclarativePolygonMapItemPrivate;
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItem : public QDeclarativeGeoMapItemBase
+class Q_LOCATION_EXPORT QDeclarativePolygonMapItem : public QDeclarativeGeoMapItemBase
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(MapPolygon)
diff --git a/src/location/quickmapitems/qdeclarativepolygonmapitem_p_p.h b/src/location/quickmapitems/qdeclarativepolygonmapitem_p_p.h
index acaa92a4..32964331 100644
--- a/src/location/quickmapitems/qdeclarativepolygonmapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativepolygonmapitem_p_p.h
@@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE
 class QQuickShape;
 class QQuickShapePath;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoMapPolygonGeometry : public QGeoMapItemGeometry
+class Q_LOCATION_EXPORT QGeoMapPolygonGeometry : public QGeoMapItemGeometry
 {
 public:
     enum MapBorderBehaviour {
@@ -61,7 +61,7 @@ protected:
     bool assumeSimple_ = false;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivate
+class Q_LOCATION_EXPORT QDeclarativePolygonMapItemPrivate
 {
     Q_DISABLE_COPY_MOVE(QDeclarativePolygonMapItemPrivate)
 public:
@@ -85,7 +85,7 @@ public:
     QDeclarativePolygonMapItem &m_poly;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivateCPU: public QDeclarativePolygonMapItemPrivate
+class Q_LOCATION_EXPORT QDeclarativePolygonMapItemPrivateCPU: public QDeclarativePolygonMapItemPrivate
 {
 public:
     QDeclarativePolygonMapItemPrivateCPU(QDeclarativePolygonMapItem &polygon);
diff --git a/src/location/quickmapitems/qdeclarativepolylinemapitem_p.h b/src/location/quickmapitems/qdeclarativepolylinemapitem_p.h
index ee295e13..d5f251f1 100644
--- a/src/location/quickmapitems/qdeclarativepolylinemapitem_p.h
+++ b/src/location/quickmapitems/qdeclarativepolylinemapitem_p.h
@@ -27,7 +27,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeMapLineProperties : public QObject
+class Q_LOCATION_EXPORT QDeclarativeMapLineProperties : public QObject
 {
     Q_OBJECT
     QML_ANONYMOUS
@@ -54,7 +54,7 @@ private:
 };
 
 class QDeclarativePolylineMapItemPrivate;
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItem : public QDeclarativeGeoMapItemBase
+class Q_LOCATION_EXPORT QDeclarativePolylineMapItem : public QDeclarativeGeoMapItemBase
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(MapPolyline)
diff --git a/src/location/quickmapitems/qdeclarativepolylinemapitem_p_p.h b/src/location/quickmapitems/qdeclarativepolylinemapitem_p_p.h
index ef482f3c..8e7ed04e 100644
--- a/src/location/quickmapitems/qdeclarativepolylinemapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativepolylinemapitem_p_p.h
@@ -42,7 +42,7 @@ struct QGeoMapPolylineGeometry : QGeoMapItemGeometry
     qreal maxCoord_ = 0.0;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivate
+class Q_LOCATION_EXPORT QDeclarativePolylineMapItemPrivate
 {
     Q_DISABLE_COPY_MOVE(QDeclarativePolylineMapItemPrivate)
 public:
@@ -66,7 +66,7 @@ public:
     QDeclarativePolylineMapItem &m_poly;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateCPU: public QDeclarativePolylineMapItemPrivate
+class Q_LOCATION_EXPORT QDeclarativePolylineMapItemPrivateCPU: public QDeclarativePolylineMapItemPrivate
 {
 public:
     QDeclarativePolylineMapItemPrivateCPU(QDeclarativePolylineMapItem &poly);
diff --git a/src/location/quickmapitems/qdeclarativerectanglemapitem_p.h b/src/location/quickmapitems/qdeclarativerectanglemapitem_p.h
index 467857fe..ae903614 100644
--- a/src/location/quickmapitems/qdeclarativerectanglemapitem_p.h
+++ b/src/location/quickmapitems/qdeclarativerectanglemapitem_p.h
@@ -28,7 +28,7 @@
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeRectangleMapItemPrivate;
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItem: public QDeclarativeGeoMapItemBase
+class Q_LOCATION_EXPORT QDeclarativeRectangleMapItem: public QDeclarativeGeoMapItemBase
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(MapRectangle)
diff --git a/src/location/quickmapitems/qdeclarativerectanglemapitem_p_p.h b/src/location/quickmapitems/qdeclarativerectanglemapitem_p_p.h
index 2df6767d..1294e0c5 100644
--- a/src/location/quickmapitems/qdeclarativerectanglemapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativerectanglemapitem_p_p.h
@@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE
 class QQuickShape;
 class QQuickShapePath;
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivate
+class Q_LOCATION_EXPORT QDeclarativeRectangleMapItemPrivate
 {
     Q_DISABLE_COPY_MOVE(QDeclarativeRectangleMapItemPrivate)
 public:
@@ -46,7 +46,7 @@ public:
     QDeclarativeRectangleMapItem &m_rect;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivateCPU: public QDeclarativeRectangleMapItemPrivate
+class Q_LOCATION_EXPORT QDeclarativeRectangleMapItemPrivateCPU: public QDeclarativeRectangleMapItemPrivate
 {
 public:
     QDeclarativeRectangleMapItemPrivateCPU(QDeclarativeRectangleMapItem &rect);
diff --git a/src/location/quickmapitems/qdeclarativeroutemapitem_p.h b/src/location/quickmapitems/qdeclarativeroutemapitem_p.h
index 2c504a74..dda83cc5 100644
--- a/src/location/quickmapitems/qdeclarativeroutemapitem_p.h
+++ b/src/location/quickmapitems/qdeclarativeroutemapitem_p.h
@@ -25,7 +25,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRouteMapItem : public QDeclarativePolylineMapItem
+class Q_LOCATION_EXPORT QDeclarativeRouteMapItem : public QDeclarativePolylineMapItem
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(MapRoute)
diff --git a/src/location/quickmapitems/qgeomapitemgeometry_p.h b/src/location/quickmapitems/qgeomapitemgeometry_p.h
index 0fa90ae4..78b71f93 100644
--- a/src/location/quickmapitems/qgeomapitemgeometry_p.h
+++ b/src/location/quickmapitems/qgeomapitemgeometry_p.h
@@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE
 class QSGGeometry;
 class QGeoMap;
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoMapItemGeometry
+class Q_LOCATION_EXPORT QGeoMapItemGeometry
 {
 public:
     static QList<QGeoCoordinate> path(const QGeoRectangle &rect)