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>

65 files changed, 188 insertions, 87 deletions

diff --git a/src/location/location.pro b/src/location/location.pro
index 4a8841b8..c68e58a5 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -37,7 +37,8 @@ PUBLIC_HEADERS += \
                     qgeopositioninfosourcefactory.h \
                     qlatin1constant.h \
                     qmobilitypluginsearch.h \
-                    qtlocation.h
+                    qtlocation.h \
+                    qlocationglobal.h
 
 PRIVATE_HEADERS += \
                     qgeoaddress_p.h \
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
 
diff --git a/src/location/mapsgl/cameradata.h b/src/location/mapsgl/cameradata.h
index 57d57e7c..78a2b3d0 100644
--- a/src/location/mapsgl/cameradata.h
+++ b/src/location/mapsgl/cameradata.h
@@ -57,7 +57,7 @@ QT_MODULE(Location)
 class Projection;
 class CameraDataPrivate;
 
-class Q_LOCATION_EXPORT CameraData
+class Q_LOCATION_EXPORT_TEMP CameraData
 {
 public:
     CameraData();
diff --git a/src/location/mapsgl/map.h b/src/location/mapsgl/map.h
index f6e86146..aac7eb50 100644
--- a/src/location/mapsgl/map.h
+++ b/src/location/mapsgl/map.h
@@ -64,7 +64,7 @@ class QGLPainter;
 
 class QPointF;
 
-class Q_LOCATION_EXPORT Map : public QObject
+class Q_LOCATION_EXPORT_TEMP Map : public QObject
 {
     Q_OBJECT
 
diff --git a/src/location/mapsgl/map3d/spheregeometry_p.h b/src/location/mapsgl/map3d/spheregeometry_p.h
index f6df4c7b..e62db082 100644
--- a/src/location/mapsgl/map3d/spheregeometry_p.h
+++ b/src/location/mapsgl/map3d/spheregeometry_p.h
@@ -52,7 +52,7 @@
 // We mean it.
 //
 
-#include "qglobal.h"
+#include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -60,7 +60,7 @@ class QGeoCoordinate;
 class QVector2D;
 class QVector3D;
 
-class Q_LOCATION_EXPORT SphereGeometry
+class Q_LOCATION_EXPORT_TEMP SphereGeometry
 {
 public:
     SphereGeometry();
diff --git a/src/location/mapsgl/map3d/viewport_p.h b/src/location/mapsgl/map3d/viewport_p.h
index f936ce28..ea40f129 100644
--- a/src/location/mapsgl/map3d/viewport_p.h
+++ b/src/location/mapsgl/map3d/viewport_p.h
@@ -74,7 +74,7 @@ class Arc;
 
 class Projection3D;
 
-class Q_LOCATION_EXPORT Viewport
+class Q_LOCATION_EXPORT_TEMP Viewport
 {
 public:
     Viewport();
diff --git a/src/location/mapsgl/mapitem.h b/src/location/mapsgl/mapitem.h
index de8cf2b3..678bf06a 100644
--- a/src/location/mapsgl/mapitem.h
+++ b/src/location/mapsgl/mapitem.h
@@ -66,7 +66,7 @@ struct MapItemGLResources {
 };
 
 
-class Q_LOCATION_EXPORT MapItem
+class Q_LOCATION_EXPORT_TEMP MapItem
 {
 public:
     MapItem();
@@ -114,7 +114,7 @@ private:
     MapItemGLResources* glResources_;
 };
 
-class Q_LOCATION_EXPORT MapItemTree
+class Q_LOCATION_EXPORT_TEMP MapItemTree
 {
 public:
     MapItemTree();
diff --git a/src/location/mapsgl/mapsphere_p.h b/src/location/mapsgl/mapsphere_p.h
index 0998ce6c..0583b3c3 100644
--- a/src/location/mapsgl/mapsphere_p.h
+++ b/src/location/mapsgl/mapsphere_p.h
@@ -52,7 +52,7 @@
 // We mean it.
 //
 
-#include "qglobal.h"
+#include <QtLocation/qlocationglobal.h>
 
 #include <QObject>
 #include <QSet>
@@ -73,7 +73,7 @@ class MapPrivate;
 
 class QGeoMappingManager;
 
-class Q_LOCATION_EXPORT MapSphere : public QObject
+class Q_LOCATION_EXPORT_TEMP MapSphere : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/mapsgl/tile.h b/src/location/mapsgl/tile.h
index 8a3f38d6..f5adc54d 100644
--- a/src/location/mapsgl/tile.h
+++ b/src/location/mapsgl/tile.h
@@ -54,7 +54,7 @@ QT_MODULE(Location)
 class QGLTexture2D;
 class QGLSceneNode;
 
-class Q_LOCATION_EXPORT Tile
+class Q_LOCATION_EXPORT_TEMP Tile
 {
 public:
     Tile();
diff --git a/src/location/mapsgl/tilecache.h b/src/location/mapsgl/tilecache.h
index 02bb8e06..a21c6407 100644
--- a/src/location/mapsgl/tilecache.h
+++ b/src/location/mapsgl/tilecache.h
@@ -41,6 +41,8 @@
 #ifndef TILECACHE_H
 #define TILECACHE_H
 
+#include <QtLocation/qlocationglobal.h>
+
 #include <QObject>
 #include <QCache>
 #include <QSet>
@@ -65,7 +67,7 @@ class QGLSceneNode;
 class QPixmap;
 class QThread;
 
-class Q_LOCATION_EXPORT TileCache : public QObject
+class Q_LOCATION_EXPORT_TEMP TileCache : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/mapsgl/tilecamera.h b/src/location/mapsgl/tilecamera.h
index 20718793..9303b5e3 100644
--- a/src/location/mapsgl/tilecamera.h
+++ b/src/location/mapsgl/tilecamera.h
@@ -55,7 +55,7 @@ class QGLCamera;
 class QGLSceneNode;
 class QVector3D;
 
-class Q_LOCATION_EXPORT TileCamera
+class Q_LOCATION_EXPORT_TEMP TileCamera
 {
 public:
     TileCamera();
diff --git a/src/location/mapsgl/tilespec.h b/src/location/mapsgl/tilespec.h
index 2fbea28c..1cf21f45 100644
--- a/src/location/mapsgl/tilespec.h
+++ b/src/location/mapsgl/tilespec.h
@@ -41,7 +41,7 @@
 #ifndef TILESPEC_H
 #define TILESPEC_H
 
-#include <QtCore/qglobal.h>
+#include <QtLocation/qlocationglobal.h>
 #include <QtCore/QMetaType>
 
 QT_BEGIN_HEADER
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Location)
 
-class Q_LOCATION_EXPORT TileSpec
+class Q_LOCATION_EXPORT_TEMP TileSpec
 {
 public:
     TileSpec();
diff --git a/src/location/places/qplaceattribute.h b/src/location/places/qplaceattribute.h
index cd39964d..716a6e69 100644
--- a/src/location/places/qplaceattribute.h
+++ b/src/location/places/qplaceattribute.h
@@ -48,6 +48,8 @@
 
 #include <qlatin1constant.h>
 
+#include <QtLocation/qlocationglobal.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -55,7 +57,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Location)
 
 class QPlaceAttributePrivate;
-class Q_LOCATION_EXPORT QPlaceAttribute
+class Q_LOCATION_EXPORT_TEMP QPlaceAttribute
 {
 public:
     QPlaceAttribute();
diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h
index 048efa43..2e44cd12 100644
--- a/src/location/places/qplacecategory.h
+++ b/src/location/places/qplacecategory.h
@@ -42,6 +42,8 @@
 #ifndef QPLACECATEGORY_H
 #define QPLACECATEGORY_H
 
+#include <QtLocation/qlocationglobal.h>
+
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QString>
 #include <QtCore/QMetaType>
@@ -56,7 +58,7 @@ QT_MODULE(Location)
 class QPlaceIcon;
 
 class QPlaceCategoryPrivate;
-class Q_LOCATION_EXPORT QPlaceCategory
+class Q_LOCATION_EXPORT_TEMP QPlaceCategory
 {
 public:
     QPlaceCategory();
diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h
index 488a70db..a496c21b 100644
--- a/src/location/places/qplacecontent.h
+++ b/src/location/places/qplacecontent.h
@@ -41,6 +41,8 @@
 #ifndef QPLACECONTENT_H
 #define QPLACECONTENT_H
 
+#include <QtLocation/qlocationglobal.h>
+
 #include <QMap>
 #include <QMetaType>
 #include <QSharedDataPointer>
@@ -62,7 +64,7 @@ QT_MODULE(Location)
 class QPlaceUser;
 class QPlaceSupplier;
 class QPlaceContentPrivate;
-class Q_LOCATION_EXPORT QPlaceContent
+class Q_LOCATION_EXPORT_TEMP QPlaceContent
 {
 public:
     typedef QMap<int, QPlaceContent> Collection;
diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h
index cb45981e..97795279 100644
--- a/src/location/places/qplacecontentreply.h
+++ b/src/location/places/qplacecontentreply.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Location)
 
 class QPlaceContentReplyPrivate;
-class Q_LOCATION_EXPORT QPlaceContentReply : public QPlaceReply
+class Q_LOCATION_EXPORT_TEMP QPlaceContentReply : public QPlaceReply
 {
     Q_OBJECT
 public:
diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h
index 06040790..6ce8691f 100644
--- a/src/location/places/qplacecontentrequest.h
+++ b/src/location/places/qplacecontentrequest.h
@@ -56,7 +56,7 @@ QT_MODULE(Location)
 
 class QPlaceContentRequestPrivate;
 
-class Q_LOCATION_EXPORT QPlaceContentRequest : public QPlaceRequest
+class Q_LOCATION_EXPORT_TEMP QPlaceContentRequest : public QPlaceRequest
 {
 public:
     QPlaceContentRequest();
diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h
index 52bbf343..aef21ab0 100644
--- a/src/location/places/qplacedetailsreply.h
+++ b/src/location/places/qplacedetailsreply.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Location)
 
 class QPlaceDetailsReplyPrivate;
-class Q_LOCATION_EXPORT QPlaceDetailsReply : public QPlaceReply
+class Q_LOCATION_EXPORT_TEMP QPlaceDetailsReply : public QPlaceReply
 {
     Q_OBJECT
 public:
diff --git a/src/location/places/qplaceeditorial.h b/src/location/places/qplaceeditorial.h
index a6df4c02..2658dc0c 100644
--- a/src/location/places/qplaceeditorial.h
+++ b/src/location/places/qplaceeditorial.h
@@ -52,7 +52,7 @@ QT_MODULE(Location)
 
 class QPlaceEditorialPrivate;
 
-class Q_LOCATION_EXPORT QPlaceEditorial : public QPlaceContent
+class Q_LOCATION_EXPORT_TEMP QPlaceEditorial : public QPlaceContent
 {
 public:
     QPlaceEditorial();
diff --git a/src/location/places/qplaceicon.h b/src/location/places/qplaceicon.h
index 9b2e94ca..e7e9e0a7 100644
--- a/src/location/places/qplaceicon.h
+++ b/src/location/places/qplaceicon.h
@@ -42,6 +42,7 @@
 #ifndef QPLACEICON_H
 #define QPLACEICON_H
 
+#include <QtLocation/qlocationglobal.h>
 
 #include <QtCore/QUrl>
 #include <QtCore/QFlags>
@@ -54,7 +55,7 @@ QT_BEGIN_NAMESPACE
 class QPlaceManager;
 
 class QPlaceIconPrivate;
-class Q_LOCATION_EXPORT QPlaceIcon
+class Q_LOCATION_EXPORT_TEMP QPlaceIcon
 {
 public:
     Q_ENUMS(QPlaceIcon::IconType)
diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h
index 54bd4a22..79dd4263 100644
--- a/src/location/places/qplaceidreply.h
+++ b/src/location/places/qplaceidreply.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Location)
 
 class QPlaceIdReplyPrivate;
-class Q_LOCATION_EXPORT QPlaceIdReply : public QPlaceReply
+class Q_LOCATION_EXPORT_TEMP QPlaceIdReply : public QPlaceReply
 {
     Q_OBJECT
 public:
diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h
index 72949b9b..a9c9e831 100644
--- a/src/location/places/qplaceimage.h
+++ b/src/location/places/qplaceimage.h
@@ -56,7 +56,7 @@ QT_MODULE(Location)
 class QPlaceImagePrivate;
 class QUrl;
 
-class Q_LOCATION_EXPORT QPlaceImage : public QPlaceContent
+class Q_LOCATION_EXPORT_TEMP QPlaceImage : public QPlaceContent
 {
 public:
     QPlaceImage();
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index b15f76f8..98ced6a0 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -67,7 +67,7 @@ class QPlaceManagerEngine;
 class QPlaceSearchRequest;
 class QPlaceSearchReply;
 
-class Q_LOCATION_EXPORT QPlaceManager : public QObject
+class Q_LOCATION_EXPORT_TEMP QPlaceManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index 38b031d5..f0ffa157 100644
--- a/src/location/places/qplacemanagerengine.h
+++ b/src/location/places/qplacemanagerengine.h
@@ -52,7 +52,7 @@ QT_MODULE(Location)
 
 class QPlaceManagerEnginePrivate;
 
-class Q_LOCATION_EXPORT QPlaceManagerEngine : public QObject
+class Q_LOCATION_EXPORT_TEMP QPlaceManagerEngine : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/places/qplacerating.h b/src/location/places/qplacerating.h
index b1e4e5a6..429556ee 100644
--- a/src/location/places/qplacerating.h
+++ b/src/location/places/qplacerating.h
@@ -42,6 +42,8 @@
 #ifndef QPLACERATING_H
 #define QPLACERATING_H
 
+#include <QtLocation/qlocationglobal.h>
+
 #include <QSharedDataPointer>
 
 QT_BEGIN_HEADER
@@ -52,7 +54,7 @@ QT_MODULE(Location)
 
 class QPlaceRatingPrivate;
 
-class Q_LOCATION_EXPORT QPlaceRating
+class Q_LOCATION_EXPORT_TEMP QPlaceRating
 {
 public:
     QPlaceRating();
diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h
index 081857f6..b9d1c8a2 100644
--- a/src/location/places/qplacereply.h
+++ b/src/location/places/qplacereply.h
@@ -42,6 +42,8 @@
 #ifndef QPLACEREPLY_H
 #define QPLACEREPLY_H
 
+#include <QtLocation/qlocationglobal.h>
+
 #include <QObject>
 
 QT_BEGIN_HEADER
@@ -51,7 +53,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Location)
 
 class QPlaceReplyPrivate;
-class Q_LOCATION_EXPORT QPlaceReply : public QObject
+class Q_LOCATION_EXPORT_TEMP QPlaceReply : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/places/qplacerequest.h b/src/location/places/qplacerequest.h
index b5592cd7..63b63855 100644
--- a/src/location/places/qplacerequest.h
+++ b/src/location/places/qplacerequest.h
@@ -42,6 +42,8 @@
 #ifndef QPLACEQUERY_H
 #define QPLACEQUERY_H
 
+#include <QtLocation/qlocationglobal.h>
+
 #include <QMetaType>
 #include <QSharedDataPointer>
 
@@ -53,7 +55,7 @@ QT_MODULE(Location)
 
 class QPlaceRequestPrivate;
 
-class Q_LOCATION_EXPORT QPlaceRequest
+class Q_LOCATION_EXPORT_TEMP QPlaceRequest
 {
 public:
     enum Type {
diff --git a/src/location/places/qplacereview.h b/src/location/places/qplacereview.h
index 559e359f..6a59e7a0 100644
--- a/src/location/places/qplacereview.h
+++ b/src/location/places/qplacereview.h
@@ -53,7 +53,7 @@ QT_MODULE(Location)
 class QDateTime;
 class QPlaceReviewPrivate;
 
-class Q_LOCATION_EXPORT QPlaceReview : public QPlaceContent
+class Q_LOCATION_EXPORT_TEMP QPlaceReview : public QPlaceContent
 {
 public:
     QPlaceReview();
diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h
index 04d66806..7e27c968 100644
--- a/src/location/places/qplacesearchreply.h
+++ b/src/location/places/qplacesearchreply.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Location)
 
 class QPlaceSearchReplyPrivate;
-class Q_LOCATION_EXPORT QPlaceSearchReply : public QPlaceReply
+class Q_LOCATION_EXPORT_TEMP QPlaceSearchReply : public QPlaceReply
 {
     Q_OBJECT
 public:
diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h
index 3caaa410..2115aa42 100644
--- a/src/location/places/qplacesearchrequest.h
+++ b/src/location/places/qplacesearchrequest.h
@@ -57,7 +57,7 @@ QT_MODULE(Location)
 class QGeoBoundingArea;
 class QPlaceSearchRequestPrivate;
 
-class Q_LOCATION_EXPORT QPlaceSearchRequest : public QPlaceRequest
+class Q_LOCATION_EXPORT_TEMP QPlaceSearchRequest : public QPlaceRequest
 {
 public:
     enum RelevanceHint {
diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h
index 67357568..1b82ecc4 100644
--- a/src/location/places/qplacesearchresult.h
+++ b/src/location/places/qplacesearchresult.h
@@ -55,7 +55,7 @@ QT_MODULE(Location)
 
 class QPlaceSearchResultPrivate;
 
-class Q_LOCATION_EXPORT QPlaceSearchResult
+class Q_LOCATION_EXPORT_TEMP QPlaceSearchResult
 {
 public:
     QPlaceSearchResult();
diff --git a/src/location/places/qplacesupplier.h b/src/location/places/qplacesupplier.h
index c3cbdce6..b06be314 100644
--- a/src/location/places/qplacesupplier.h
+++ b/src/location/places/qplacesupplier.h
@@ -54,7 +54,7 @@ QT_MODULE(Location)
 class QUrl;
 class QPlaceSupplierPrivate;
 
-class Q_LOCATION_EXPORT QPlaceSupplier
+class Q_LOCATION_EXPORT_TEMP QPlaceSupplier
 {
 public:
     QPlaceSupplier();
diff --git a/src/location/places/qplacetextpredictionreply.h b/src/location/places/qplacetextpredictionreply.h
index 0df0e7a5..c7580453 100644
--- a/src/location/places/qplacetextpredictionreply.h
+++ b/src/location/places/qplacetextpredictionreply.h
@@ -54,7 +54,7 @@ QT_MODULE(Location)
 
 class QPlaceTextPredictionReplyPrivate;
 
-class Q_LOCATION_EXPORT QPlaceTextPredictionReply : public QPlaceReply
+class Q_LOCATION_EXPORT_TEMP QPlaceTextPredictionReply : public QPlaceReply
 {
     Q_OBJECT
 public:
diff --git a/src/location/places/qplaceuser.h b/src/location/places/qplaceuser.h
index d554cfd2..6a9eeb76 100644
--- a/src/location/places/qplaceuser.h
+++ b/src/location/places/qplaceuser.h
@@ -42,6 +42,8 @@
 #ifndef QPLACEUSER_H
 #define QPLACEUSER_H
 
+#include <QtLocation/qlocationglobal.h>
+
 #include <QSharedDataPointer>
 
 QT_BEGIN_HEADER
@@ -52,7 +54,7 @@ QT_MODULE(Location)
 
 class QPlaceUserPrivate;
 
-class Q_LOCATION_EXPORT QPlaceUser
+class Q_LOCATION_EXPORT_TEMP QPlaceUser
 {
 public:
     QPlaceUser();
diff --git a/src/location/qgeoaddress.h b/src/location/qgeoaddress.h
index 69e771b6..a9ef50bf 100644
--- a/src/location/qgeoaddress.h
+++ b/src/location/qgeoaddress.h
@@ -43,6 +43,7 @@
 #define QGEOADDRESS_H
 
 #include <QSharedDataPointer>
+#include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_HEADER
 
@@ -52,7 +53,7 @@ QT_MODULE(Location)
 
 class QString;
 class QGeoAddressPrivate;
-class Q_LOCATION_EXPORT QGeoAddress
+class Q_LOCATION_EXPORT_TEMP QGeoAddress
 {
 public:
     QGeoAddress();
diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h
index ad640452..6df75336 100644
--- a/src/location/qgeoareamonitor.h
+++ b/src/location/qgeoareamonitor.h
@@ -53,7 +53,7 @@ QT_MODULE(Location)
 
 class QGeoPositionInfo;
 class QGeoAreaMonitorPrivate;
-class Q_LOCATION_EXPORT QGeoAreaMonitor : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeoAreaMonitor : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter)
diff --git a/src/location/qgeoboundingarea.h b/src/location/qgeoboundingarea.h
index b9369261..cf54ad15 100644
--- a/src/location/qgeoboundingarea.h
+++ b/src/location/qgeoboundingarea.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Location)
 
-class Q_LOCATION_EXPORT QGeoBoundingArea
+class Q_LOCATION_EXPORT_TEMP QGeoBoundingArea
 {
 public:
     enum AreaType {
diff --git a/src/location/qgeoboundingbox.h b/src/location/qgeoboundingbox.h
index d0898c52..e469ee21 100644
--- a/src/location/qgeoboundingbox.h
+++ b/src/location/qgeoboundingbox.h
@@ -55,7 +55,7 @@ QT_MODULE(Location)
 class QGeoCoordinate;
 class QGeoBoundingBoxPrivate;
 
-class Q_LOCATION_EXPORT QGeoBoundingBox : public QGeoBoundingArea
+class Q_LOCATION_EXPORT_TEMP QGeoBoundingBox : public QGeoBoundingArea
 {
 public:
     QGeoBoundingBox();
diff --git a/src/location/qgeoboundingcircle.h b/src/location/qgeoboundingcircle.h
index 5c013709..96474c56 100644
--- a/src/location/qgeoboundingcircle.h
+++ b/src/location/qgeoboundingcircle.h
@@ -55,7 +55,7 @@ QT_MODULE(Location)
 class QGeoCoordinate;
 class QGeoBoundingCirclePrivate;
 
-class Q_LOCATION_EXPORT QGeoBoundingCircle : public QGeoBoundingArea
+class Q_LOCATION_EXPORT_TEMP QGeoBoundingCircle : public QGeoBoundingArea
 {
 public:
     QGeoBoundingCircle();
diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h
index 1a0f6c97..4c0f3755 100644
--- a/src/location/qgeocoordinate.h
+++ b/src/location/qgeocoordinate.h
@@ -43,6 +43,7 @@
 #define QGEOCOORDINATE_H
 
 #include <QString>
+#include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_HEADER
 
@@ -54,7 +55,7 @@ class QDebug;
 class QDataStream;
 
 class QGeoCoordinatePrivate;
-class Q_LOCATION_EXPORT QGeoCoordinate
+class Q_LOCATION_EXPORT_TEMP QGeoCoordinate
 {
 public:
     enum CoordinateType {
@@ -111,12 +112,12 @@ private:
 };
 
 #ifndef QT_NO_DEBUG_STREAM
-Q_LOCATION_EXPORT QDebug operator<<(QDebug, const QGeoCoordinate &);
+Q_LOCATION_EXPORT_TEMP QDebug operator<<(QDebug, const QGeoCoordinate &);
 #endif
 
 #ifndef QT_NO_DATASTREAM
-Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoCoordinate &coordinate);
-Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate);
+Q_LOCATION_EXPORT_TEMP QDataStream &operator<<(QDataStream &stream, const QGeoCoordinate &coordinate);
+Q_LOCATION_EXPORT_TEMP QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate);
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/location/qgeolocation.h b/src/location/qgeolocation.h
index 78b419fa..b77a19a3 100644
--- a/src/location/qgeolocation.h
+++ b/src/location/qgeolocation.h
@@ -58,7 +58,7 @@ QT_MODULE(Location)
 
 class QGeoLocationPrivate;
 
-class Q_LOCATION_EXPORT QGeoLocation
+class Q_LOCATION_EXPORT_TEMP QGeoLocation
 {
 public:
     QGeoLocation();
diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h
index 0e237902..51eca379 100644
--- a/src/location/qgeopositioninfo.h
+++ b/src/location/qgeopositioninfo.h
@@ -55,7 +55,7 @@ class QDebug;
 class QDataStream;
 
 class QGeoPositionInfoPrivate;
-class Q_LOCATION_EXPORT QGeoPositionInfo
+class Q_LOCATION_EXPORT_TEMP QGeoPositionInfo
 {
 public:
     enum Attribute {
@@ -94,22 +94,22 @@ public:
 
 private:
 #ifndef QT_NO_DEBUG_STREAM
-    friend Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info);
+    friend Q_LOCATION_EXPORT_TEMP QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info);
 #endif
 #ifndef QT_NO_DATASTREAM
-    friend Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info);
-    friend Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info);
+    friend Q_LOCATION_EXPORT_TEMP QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info);
+    friend Q_LOCATION_EXPORT_TEMP QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info);
 #endif
     QGeoPositionInfoPrivate *d;
 };
 
 #ifndef QT_NO_DEBUG_STREAM
-Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info);
+Q_LOCATION_EXPORT_TEMP QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info);
 #endif
 
 #ifndef QT_NO_DATASTREAM
-Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info);
-Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info);
+Q_LOCATION_EXPORT_TEMP QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info);
+Q_LOCATION_EXPORT_TEMP QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info);
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h
index 7daa4908..792dcdfa 100644
--- a/src/location/qgeopositioninfosource.h
+++ b/src/location/qgeopositioninfosource.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Location)
 
 class QGeoPositionInfoSourcePrivate;
-class Q_LOCATION_EXPORT QGeoPositionInfoSource : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeoPositionInfoSource : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int updateInterval READ updateInterval WRITE setUpdateInterval)
diff --git a/src/location/qgeopositioninfosourcefactory.h b/src/location/qgeopositioninfosourcefactory.h
index 57aa00c8..3c705237 100644
--- a/src/location/qgeopositioninfosourcefactory.h
+++ b/src/location/qgeopositioninfosourcefactory.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Location)
 
-class Q_LOCATION_EXPORT QGeoPositionInfoSourceFactory
+class Q_LOCATION_EXPORT_TEMP QGeoPositionInfoSourceFactory
 {
 public:
     virtual ~QGeoPositionInfoSourceFactory();
diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h
index f3af4df3..fa016dc5 100644
--- a/src/location/qgeosatelliteinfo.h
+++ b/src/location/qgeosatelliteinfo.h
@@ -41,7 +41,7 @@
 #ifndef QGEOSATELLITEINFO_H
 #define QGEOSATELLITEINFO_H
 
-#include <QtCore/QtGlobal>
+#include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_HEADER
 
@@ -53,7 +53,7 @@ class QDebug;
 class QDataStream;
 
 class QGeoSatelliteInfoPrivate;
-class Q_LOCATION_EXPORT QGeoSatelliteInfo
+class Q_LOCATION_EXPORT_TEMP QGeoSatelliteInfo
 {
 public:
     enum Attribute {
@@ -86,22 +86,22 @@ public:
 
 private:
 #ifndef QT_NO_DEBUG_STREAM
-    friend Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info);
+    friend Q_LOCATION_EXPORT_TEMP QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info);
 #endif
 #ifndef QT_NO_DATASTREAM
-    friend Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info);
-    friend Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info);
+    friend Q_LOCATION_EXPORT_TEMP QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info);
+    friend Q_LOCATION_EXPORT_TEMP QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info);
 #endif
     QGeoSatelliteInfoPrivate *d;
 };
 
 #ifndef QT_NO_DEBUG_STREAM
-Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info);
+Q_LOCATION_EXPORT_TEMP QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info);
 #endif
 
 #ifndef QT_NO_DATASTREAM
-Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info);
-Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info);
+Q_LOCATION_EXPORT_TEMP QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info);
+Q_LOCATION_EXPORT_TEMP QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info);
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h
index 7bc2fab0..807f760c 100644
--- a/src/location/qgeosatelliteinfosource.h
+++ b/src/location/qgeosatelliteinfosource.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Location)
 
 class QGeoSatelliteInfoSourcePrivate;
-class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject
+class Q_LOCATION_EXPORT_TEMP QGeoSatelliteInfoSource : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/location/qlocationglobal.h b/src/location/qlocationglobal.h
new file mode 100644
index 00000000..75bef671
--- /dev/null
+++ b/src/location/qlocationglobal.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QLOCATIONGLOBAL_H
+#define QLOCATIONGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(Q_OS_WIN)
+#  if defined(QT_NODLL)
+#    undef QT_MAKEDLL
+#    undef QT_DLL
+#  elif defined(QT_MAKEDLL)
+#    if defined(QT_DLL)
+#      undef QT_DLL
+#    endif
+#    if defined(QT_BUILD_LOCATION_LIB)
+#      define Q_LOCATION_EXPORT_TEMP Q_DECL_EXPORT
+#    else
+#      define Q_LOCATION_EXPORT_TEMP Q_DECL_IMPORT
+#    endif
+#  elif defined(QT_DLL)
+#    define Q_LOCATION_EXPORT_TEMP Q_DECL_EXPORT
+#  endif
+#endif
+
+#if !defined(Q_LOCATION_EXPORT_TEMP)
+#  if defined(QT_SHARED)
+#    define Q_LOCATION_EXPORT_TEMP Q_DECL_EXPORT
+#  else
+#    define Q_LOCATION_EXPORT_TEMP
+#  endif
+#endif
+
+#endif // QLOCATIONGLOBAL_H
+
diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h
index 79da9037..ebddde03 100644
--- a/src/location/qnmeapositioninfosource.h
+++ b/src/location/qnmeapositioninfosource.h
@@ -52,7 +52,7 @@ QT_MODULE(Location)
 class QIODevice;
 
 class QNmeaPositionInfoSourcePrivate;
-class Q_LOCATION_EXPORT QNmeaPositionInfoSource : public QGeoPositionInfoSource
+class Q_LOCATION_EXPORT_TEMP QNmeaPositionInfoSource : public QGeoPositionInfoSource
 {
     Q_OBJECT
 public:
diff --git a/src/location/qplace.h b/src/location/qplace.h
index 3f33ca06..f466c214 100644
--- a/src/location/qplace.h
+++ b/src/location/qplace.h
@@ -65,7 +65,7 @@ class QString;
 class QPlaceIcon;
 class QPlacePrivate;
 
-class Q_LOCATION_EXPORT QPlace
+class Q_LOCATION_EXPORT_TEMP QPlace
 {
 public:
     typedef QMap<QString, QPlaceAttribute> ExtendedAttributes;
diff --git a/src/location/qtlocation.h b/src/location/qtlocation.h
index 363eb503..6dfac00c 100644
--- a/src/location/qtlocation.h
+++ b/src/location/qtlocation.h
@@ -42,7 +42,7 @@
 #ifndef QTLOCATION_H
 #define QTLOCATION_H
 
-#include <QtCore/QtGlobal>
+#include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h
index db65b9b9..2c0e7c16 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h
@@ -82,9 +82,9 @@ public:
     QPlaceIdReply *removeCategory(const QString &categoryId);
 
     QPlaceReply *initializeCategories();
-    QString parentCategoryId(const QString &categoryId) const {return QString();}
-    virtual QStringList childrenCategoryIds(const QString &categoryId) const {return QStringList();}
-    virtual QPlaceCategory category(const QString &categoryId) const {return QPlaceCategory();}
+    QString parentCategoryId(const QString &/*categoryId*/) const {return QString();}
+    virtual QStringList childrenCategoryIds(const QString &/*categoryId*/) const {return QStringList();}
+    virtual QPlaceCategory category(const QString &/*categoryId*/) const {return QPlaceCategory();}
     QList<QPlaceCategory> childCategories(const QString &parentId) const;
 
     QLocale locale() const;