First step of removal of Q_LOCATION_EXPORT macro from qglobal.h

Each module handles each its own exports. We need to change the
QtLocation version, remove the qglobal.h define and then add it back
under the old name in QtLocation

Change-Id: I7530a251b78402215a466cd55a33ec24664786b7
Reviewed-by: Alex <alex.blasche@nokia.com>

15 files changed, 24 insertions, 16 deletions

diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h
index 6a2c6d82..15e7e234 100644
--- a/src/location/maps/qgeocodereply.h
+++ b/src/location/maps/qgeocodereply.h
@@ -55,7 +55,7 @@ QT_MODULE(Location)
 
 class QGeocodeReplyPrivate;
 
-class Q_LOCATION_EXPORT QGeocodeReply : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeocodeReply : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h
index c043a6a7..eb1f0aca 100644
--- a/src/location/maps/qgeocodingmanager.h
+++ b/src/location/maps/qgeocodingmanager.h
@@ -60,7 +60,7 @@ class QLocale;
 class QGeocodingManagerEngine;
 class QGeocodingManagerPrivate;
 
-class Q_LOCATION_EXPORT QGeocodingManager : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeocodingManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h
index 2db024d4..6b99f61c 100644
--- a/src/location/maps/qgeocodingmanagerengine.h
+++ b/src/location/maps/qgeocodingmanagerengine.h
@@ -57,7 +57,7 @@ QT_MODULE(Location)
 
 class QGeocodingManagerEnginePrivate;
 
-class Q_LOCATION_EXPORT QGeocodingManagerEngine : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeocodingManagerEngine : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h
index 26603fee..3f52ff12 100644
--- a/src/location/maps/qgeomaneuver.h
+++ b/src/location/maps/qgeomaneuver.h
@@ -43,6 +43,7 @@
 #define QGEOMANEUVER_H
 
 #include <qshareddata.h>
+#include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_HEADER
 
@@ -55,7 +56,7 @@ class QString;
 class QGeoCoordinate;
 class QGeoManeuverPrivate;
 
-class Q_LOCATION_EXPORT QGeoManeuver
+class Q_LOCATION_EXPORT_TEMP QGeoManeuver
 {
 
 public:
diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h
index b72860ce..b8f6ebef 100644
--- a/src/location/maps/qgeomappingmanager.h
+++ b/src/location/maps/qgeomappingmanager.h
@@ -45,6 +45,7 @@
 #include <QObject>
 #include <QSize>
 #include <QPair>
+#include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_HEADER
 
@@ -64,7 +65,7 @@ class QGeoMappingManagerEngine;
 class QGeoTiledMapReply;
 class TileSpec;
 
-class Q_LOCATION_EXPORT QGeoMappingManager : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeoMappingManager : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h
index 459feff1..5ec743cf 100644
--- a/src/location/maps/qgeomappingmanagerengine.h
+++ b/src/location/maps/qgeomappingmanagerengine.h
@@ -45,6 +45,7 @@
 #include <QObject>
 #include <QSize>
 #include <QPair>
+#include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_HEADER
 
@@ -65,7 +66,7 @@ class QGeoMappingManagerEnginePrivate;
 class QGeoTiledMapReply;
 class TileSpec;
 
-class Q_LOCATION_EXPORT QGeoMappingManagerEngine : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeoMappingManagerEngine : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h
index 670c4ce0..71c15bc2 100644
--- a/src/location/maps/qgeoroute.h
+++ b/src/location/maps/qgeoroute.h
@@ -60,7 +60,7 @@ class QGeoRouteSegment;
 
 class QGeoRoutePrivate;
 
-class Q_LOCATION_EXPORT QGeoRoute
+class Q_LOCATION_EXPORT_TEMP QGeoRoute
 {
 public:
     QGeoRoute();
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index 888f95d6..a511f1f6 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -56,7 +56,7 @@ QT_MODULE(Location)
 class QGeoRouteRequest;
 class QGeoRouteReplyPrivate;
 
-class Q_LOCATION_EXPORT QGeoRouteReply : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeoRouteReply : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h
index dfcbde06..0fc725d8 100644
--- a/src/location/maps/qgeorouterequest.h
+++ b/src/location/maps/qgeorouterequest.h
@@ -46,6 +46,8 @@
 #include <QExplicitlySharedDataPointer>
 #include <QDateTime>
 
+#include <QtLocation/qlocationglobal.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -56,7 +58,7 @@ class QGeoCoordinate;
 class QGeoBoundingBox;
 class QGeoRouteRequestPrivate;
 
-class Q_LOCATION_EXPORT QGeoRouteRequest
+class Q_LOCATION_EXPORT_TEMP QGeoRouteRequest
 {
 public:
     enum TravelMode {
diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h
index 900563d9..0fdbc348 100644
--- a/src/location/maps/qgeoroutesegment.h
+++ b/src/location/maps/qgeoroutesegment.h
@@ -44,6 +44,7 @@
 
 #include <QExplicitlySharedDataPointer>
 #include <QList>
+#include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_HEADER
 
@@ -55,7 +56,7 @@ class QGeoCoordinate;
 class QGeoManeuver;
 class QGeoRouteSegmentPrivate;
 
-class Q_LOCATION_EXPORT QGeoRouteSegment
+class Q_LOCATION_EXPORT_TEMP QGeoRouteSegment
 {
 
 public:
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index 4ada532b..c105750d 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -59,7 +59,7 @@ class QLocale;
 class QGeoRoutingManagerEngine;
 class QGeoRoutingManagerPrivate;
 
-class Q_LOCATION_EXPORT QGeoRoutingManager : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeoRoutingManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index 3c028bed..053ff8bb 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -58,7 +58,7 @@ class QLocale;
 
 class QGeoRoutingManagerEnginePrivate;
 
-class Q_LOCATION_EXPORT QGeoRoutingManagerEngine : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeoRoutingManagerEngine : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h
index d43b08a1..c24d5975 100644
--- a/src/location/maps/qgeoserviceprovider.h
+++ b/src/location/maps/qgeoserviceprovider.h
@@ -46,6 +46,8 @@
 #include <QVariant>
 #include <QString>
 
+#include <QtLocation/qlocationglobal.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -63,7 +65,7 @@ class QGeoRoutingManagerEngine;
 class QPlaceManagerEngine;
 class QGeoServiceProviderPrivate;
 
-class Q_LOCATION_EXPORT QGeoServiceProvider
+class Q_LOCATION_EXPORT_TEMP QGeoServiceProvider
 {
 public:
     enum Error {
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h
index 77b342a0..ac770110 100644
--- a/src/location/maps/qgeoserviceproviderfactory.h
+++ b/src/location/maps/qgeoserviceproviderfactory.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Location)
 
-class Q_LOCATION_EXPORT QGeoServiceProviderFactory
+class Q_LOCATION_EXPORT_TEMP QGeoServiceProviderFactory
 {
 public:
     virtual ~QGeoServiceProviderFactory() {}
diff --git a/src/location/maps/qgeotiledmapreply.h b/src/location/maps/qgeotiledmapreply.h
index eae73cbc..dcb680fe 100644
--- a/src/location/maps/qgeotiledmapreply.h
+++ b/src/location/maps/qgeotiledmapreply.h
@@ -42,7 +42,7 @@
 #ifndef QGEOTILEDMAPREPLY_H
 #define QGEOTILEDMAPREPLY_H
 
-#include "qglobal.h"
+#include <QtLocation/qlocationglobal.h>
 
 #include <QObject>
 
@@ -55,7 +55,7 @@ QT_MODULE(Location)
 class TileSpec;
 class QGeoTiledMapReplyPrivate;
 
-class Q_LOCATION_EXPORT QGeoTiledMapReply : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeoTiledMapReply : public QObject
 {
     Q_OBJECT