Remove QT_MODULE(Location) from public Location classes

Removing all location related defines from qglobal.h causes this macro
to fail. It seems that it is no longer used in new modules.

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

62 files changed, 62 insertions, 62 deletions

diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h
index 6ab254fa..83e5fc59 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QDeclarativePlaceEditorialModel : public QDeclarativePlaceContentModel
 {
diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h
index 15e7e234..16882b2d 100644
--- a/src/location/maps/qgeocodereply.h
+++ b/src/location/maps/qgeocodereply.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeocodeReplyPrivate;
 
diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h
index eb1f0aca..f1363658 100644
--- a/src/location/maps/qgeocodingmanager.h
+++ b/src/location/maps/qgeocodingmanager.h
@@ -53,7 +53,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QLocale;
 
diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h
index 6b99f61c..db702509 100644
--- a/src/location/maps/qgeocodingmanagerengine.h
+++ b/src/location/maps/qgeocodingmanagerengine.h
@@ -53,7 +53,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeocodingManagerEnginePrivate;
 
diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h
index 3f52ff12..4ed7130c 100644
--- a/src/location/maps/qgeomaneuver.h
+++ b/src/location/maps/qgeomaneuver.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QString;
 
diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h
index b8f6ebef..deac7227 100644
--- a/src/location/maps/qgeomappingmanager.h
+++ b/src/location/maps/qgeomappingmanager.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QLocale;
 
diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h
index 5ec743cf..9beb567b 100644
--- a/src/location/maps/qgeomappingmanagerengine.h
+++ b/src/location/maps/qgeomappingmanagerengine.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QLocale;
 
diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h
index 71c15bc2..3b007414 100644
--- a/src/location/maps/qgeoroute.h
+++ b/src/location/maps/qgeoroute.h
@@ -53,7 +53,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoBoundingBox;
 class QGeoRouteSegment;
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index a511f1f6..2e6cf776 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoRouteRequest;
 class QGeoRouteReplyPrivate;
diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h
index 0fc725d8..11dec53e 100644
--- a/src/location/maps/qgeorouterequest.h
+++ b/src/location/maps/qgeorouterequest.h
@@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoCoordinate;
 class QGeoBoundingBox;
diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h
index 0fdbc348..06c83d2a 100644
--- a/src/location/maps/qgeoroutesegment.h
+++ b/src/location/maps/qgeoroutesegment.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoCoordinate;
 class QGeoManeuver;
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index c105750d..a5ee37b7 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QLocale;
 
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index 053ff8bb..2f0af847 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QLocale;
 
diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h
index c24d5975..12f7bc22 100644
--- a/src/location/maps/qgeoserviceprovider.h
+++ b/src/location/maps/qgeoserviceprovider.h
@@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QStringList;
 class QGeocodingManager;
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h
index ac770110..6f909b2a 100644
--- a/src/location/maps/qgeoserviceproviderfactory.h
+++ b/src/location/maps/qgeoserviceproviderfactory.h
@@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class Q_LOCATION_EXPORT_TEMP QGeoServiceProviderFactory
 {
diff --git a/src/location/maps/qgeotiledmapreply.h b/src/location/maps/qgeotiledmapreply.h
index dcb680fe..2aa8d808 100644
--- a/src/location/maps/qgeotiledmapreply.h
+++ b/src/location/maps/qgeotiledmapreply.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class TileSpec;
 class QGeoTiledMapReplyPrivate;
diff --git a/src/location/mapsgl/cameradata.h b/src/location/mapsgl/cameradata.h
index 78a2b3d0..a5beb2a0 100644
--- a/src/location/mapsgl/cameradata.h
+++ b/src/location/mapsgl/cameradata.h
@@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class Projection;
 class CameraDataPrivate;
diff --git a/src/location/mapsgl/map.h b/src/location/mapsgl/map.h
index aac7eb50..1e809e2f 100644
--- a/src/location/mapsgl/map.h
+++ b/src/location/mapsgl/map.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoCoordinate;
 
diff --git a/src/location/mapsgl/mapitem.h b/src/location/mapsgl/mapitem.h
index 678bf06a..7e8a5801 100644
--- a/src/location/mapsgl/mapitem.h
+++ b/src/location/mapsgl/mapitem.h
@@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGLTexture2D;
 class QGLMaterial;
diff --git a/src/location/mapsgl/tile.h b/src/location/mapsgl/tile.h
index f5adc54d..6aac51bf 100644
--- a/src/location/mapsgl/tile.h
+++ b/src/location/mapsgl/tile.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGLTexture2D;
 class QGLSceneNode;
diff --git a/src/location/mapsgl/tilecache.h b/src/location/mapsgl/tilecache.h
index a21c6407..94b55a88 100644
--- a/src/location/mapsgl/tilecache.h
+++ b/src/location/mapsgl/tilecache.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoMappingManager;
 
diff --git a/src/location/mapsgl/tilecamera.h b/src/location/mapsgl/tilecamera.h
index 9303b5e3..78c60d0d 100644
--- a/src/location/mapsgl/tilecamera.h
+++ b/src/location/mapsgl/tilecamera.h
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class SphereGeometry;
 class QGLCamera;
diff --git a/src/location/mapsgl/tilespec.h b/src/location/mapsgl/tilespec.h
index 1cf21f45..8b105105 100644
--- a/src/location/mapsgl/tilespec.h
+++ b/src/location/mapsgl/tilespec.h
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class Q_LOCATION_EXPORT_TEMP TileSpec
 {
diff --git a/src/location/places/placemacro.h b/src/location/places/placemacro.h
index 09de78f4..6dfa399f 100644
--- a/src/location/places/placemacro.h
+++ b/src/location/places/placemacro.h
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 #define Q_DECLARE_D_FUNC(Class) \
     inline Class##Private* d_func(); \
diff --git a/src/location/places/qplaceattribute.h b/src/location/places/qplaceattribute.h
index 716a6e69..d5edc6e2 100644
--- a/src/location/places/qplaceattribute.h
+++ b/src/location/places/qplaceattribute.h
@@ -54,7 +54,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceAttributePrivate;
 class Q_LOCATION_EXPORT_TEMP QPlaceAttribute
diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h
index 2e44cd12..5570841d 100644
--- a/src/location/places/qplacecategory.h
+++ b/src/location/places/qplacecategory.h
@@ -53,7 +53,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceIcon;
 
diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h
index a496c21b..16a20200 100644
--- a/src/location/places/qplacecontent.h
+++ b/src/location/places/qplacecontent.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 #define Q_DECLARE_CONTENT_D_FUNC(Class) \
     inline Class##Private* d_func(); \
diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h
index 97795279..8b9a9ead 100644
--- a/src/location/places/qplacecontentreply.h
+++ b/src/location/places/qplacecontentreply.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceContentReplyPrivate;
 class Q_LOCATION_EXPORT_TEMP QPlaceContentReply : public QPlaceReply
diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h
index 6ce8691f..a9b47ddc 100644
--- a/src/location/places/qplacecontentrequest.h
+++ b/src/location/places/qplacecontentrequest.h
@@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceContentRequestPrivate;
 
diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h
index aef21ab0..bcba66fb 100644
--- a/src/location/places/qplacedetailsreply.h
+++ b/src/location/places/qplacedetailsreply.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceDetailsReplyPrivate;
 class Q_LOCATION_EXPORT_TEMP QPlaceDetailsReply : public QPlaceReply
diff --git a/src/location/places/qplaceeditorial.h b/src/location/places/qplaceeditorial.h
index 2658dc0c..6bacc42d 100644
--- a/src/location/places/qplaceeditorial.h
+++ b/src/location/places/qplaceeditorial.h
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceEditorialPrivate;
 
diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h
index 79dd4263..f879ce7b 100644
--- a/src/location/places/qplaceidreply.h
+++ b/src/location/places/qplaceidreply.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceIdReplyPrivate;
 class Q_LOCATION_EXPORT_TEMP QPlaceIdReply : public QPlaceReply
diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h
index a9c9e831..eea76dfd 100644
--- a/src/location/places/qplaceimage.h
+++ b/src/location/places/qplaceimage.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceImagePrivate;
 class QUrl;
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index 98ced6a0..9e0089f5 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -61,7 +61,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceManagerEngine;
 class QPlaceSearchRequest;
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index f0ffa157..33461456 100644
--- a/src/location/places/qplacemanagerengine.h
+++ b/src/location/places/qplacemanagerengine.h
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceManagerEnginePrivate;
 
diff --git a/src/location/places/qplacerating.h b/src/location/places/qplacerating.h
index 429556ee..4cfcb25d 100644
--- a/src/location/places/qplacerating.h
+++ b/src/location/places/qplacerating.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceRatingPrivate;
 
diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h
index b9d1c8a2..c4a93323 100644
--- a/src/location/places/qplacereply.h
+++ b/src/location/places/qplacereply.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceReplyPrivate;
 class Q_LOCATION_EXPORT_TEMP QPlaceReply : public QObject
diff --git a/src/location/places/qplacerequest.h b/src/location/places/qplacerequest.h
index 63b63855..0111089d 100644
--- a/src/location/places/qplacerequest.h
+++ b/src/location/places/qplacerequest.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceRequestPrivate;
 
diff --git a/src/location/places/qplacereview.h b/src/location/places/qplacereview.h
index 6a59e7a0..51ca7f31 100644
--- a/src/location/places/qplacereview.h
+++ b/src/location/places/qplacereview.h
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QDateTime;
 class QPlaceReviewPrivate;
diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h
index 7e27c968..3f5dfe22 100644
--- a/src/location/places/qplacesearchreply.h
+++ b/src/location/places/qplacesearchreply.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceSearchReplyPrivate;
 class Q_LOCATION_EXPORT_TEMP QPlaceSearchReply : public QPlaceReply
diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h
index 2115aa42..940eae4f 100644
--- a/src/location/places/qplacesearchrequest.h
+++ b/src/location/places/qplacesearchrequest.h
@@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoBoundingArea;
 class QPlaceSearchRequestPrivate;
diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h
index 1b82ecc4..8c5f07b2 100644
--- a/src/location/places/qplacesearchresult.h
+++ b/src/location/places/qplacesearchresult.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceSearchResultPrivate;
 
diff --git a/src/location/places/qplacesupplier.h b/src/location/places/qplacesupplier.h
index b06be314..c0f5b583 100644
--- a/src/location/places/qplacesupplier.h
+++ b/src/location/places/qplacesupplier.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QUrl;
 class QPlaceSupplierPrivate;
diff --git a/src/location/places/qplacetextpredictionreply.h b/src/location/places/qplacetextpredictionreply.h
index c7580453..71c1e7ea 100644
--- a/src/location/places/qplacetextpredictionreply.h
+++ b/src/location/places/qplacetextpredictionreply.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceTextPredictionReplyPrivate;
 
diff --git a/src/location/places/qplaceuser.h b/src/location/places/qplaceuser.h
index 6a9eeb76..2bc4247a 100644
--- a/src/location/places/qplaceuser.h
+++ b/src/location/places/qplaceuser.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceUserPrivate;
 
diff --git a/src/location/qgeoaddress.h b/src/location/qgeoaddress.h
index a9ef50bf..7aaa53a3 100644
--- a/src/location/qgeoaddress.h
+++ b/src/location/qgeoaddress.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QString;
 class QGeoAddressPrivate;
diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h
index 6df75336..e5c88f62 100644
--- a/src/location/qgeoareamonitor.h
+++ b/src/location/qgeoareamonitor.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoPositionInfo;
 class QGeoAreaMonitorPrivate;
diff --git a/src/location/qgeoboundingarea.h b/src/location/qgeoboundingarea.h
index cf54ad15..ef116e1e 100644
--- a/src/location/qgeoboundingarea.h
+++ b/src/location/qgeoboundingarea.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class Q_LOCATION_EXPORT_TEMP QGeoBoundingArea
 {
diff --git a/src/location/qgeoboundingbox.h b/src/location/qgeoboundingbox.h
index e469ee21..4f150803 100644
--- a/src/location/qgeoboundingbox.h
+++ b/src/location/qgeoboundingbox.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoCoordinate;
 class QGeoBoundingBoxPrivate;
diff --git a/src/location/qgeoboundingcircle.h b/src/location/qgeoboundingcircle.h
index 96474c56..28bd7c7f 100644
--- a/src/location/qgeoboundingcircle.h
+++ b/src/location/qgeoboundingcircle.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoCoordinate;
 class QGeoBoundingCirclePrivate;
diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h
index 4c0f3755..10827f74 100644
--- a/src/location/qgeocoordinate.h
+++ b/src/location/qgeocoordinate.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QDebug;
 class QDataStream;
diff --git a/src/location/qgeolocation.h b/src/location/qgeolocation.h
index b77a19a3..a3f6d83a 100644
--- a/src/location/qgeolocation.h
+++ b/src/location/qgeolocation.h
@@ -54,7 +54,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoLocationPrivate;
 
diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h
index 51eca379..215af062 100644
--- a/src/location/qgeopositioninfo.h
+++ b/src/location/qgeopositioninfo.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QDebug;
 class QDataStream;
diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h
index 792dcdfa..60d72454 100644
--- a/src/location/qgeopositioninfosource.h
+++ b/src/location/qgeopositioninfosource.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoPositionInfoSourcePrivate;
 class Q_LOCATION_EXPORT_TEMP QGeoPositionInfoSource : public QObject
diff --git a/src/location/qgeopositioninfosourcefactory.h b/src/location/qgeopositioninfosourcefactory.h
index 3c705237..f7c71e78 100644
--- a/src/location/qgeopositioninfosourcefactory.h
+++ b/src/location/qgeopositioninfosourcefactory.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class Q_LOCATION_EXPORT_TEMP QGeoPositionInfoSourceFactory
 {
diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h
index fa016dc5..9bf18168 100644
--- a/src/location/qgeosatelliteinfo.h
+++ b/src/location/qgeosatelliteinfo.h
@@ -47,7 +47,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QDebug;
 class QDataStream;
diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h
index 807f760c..fe6dbb64 100644
--- a/src/location/qgeosatelliteinfosource.h
+++ b/src/location/qgeosatelliteinfosource.h
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QGeoSatelliteInfoSourcePrivate;
 class Q_LOCATION_EXPORT_TEMP QGeoSatelliteInfoSource : public QObject
diff --git a/src/location/qlatin1constant.h b/src/location/qlatin1constant.h
index 7b0562ef..fb60a7e5 100644
--- a/src/location/qlatin1constant.h
+++ b/src/location/qlatin1constant.h
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 /*
  * QLatin1Constant
diff --git a/src/location/qmobilitypluginsearch.h b/src/location/qmobilitypluginsearch.h
index 0ccdf606..5f0464d6 100644
--- a/src/location/qmobilitypluginsearch.h
+++ b/src/location/qmobilitypluginsearch.h
@@ -54,7 +54,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 #if defined(Q_OS_SYMBIAN)
 static inline bool qSymbian_CheckDir(const QDir& dir, RFs& rfs)
diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h
index ebddde03..d6912f66 100644
--- a/src/location/qnmeapositioninfosource.h
+++ b/src/location/qnmeapositioninfosource.h
@@ -47,7 +47,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QIODevice;
 
diff --git a/src/location/qplace.h b/src/location/qplace.h
index f466c214..e4cb8059 100644
--- a/src/location/qplace.h
+++ b/src/location/qplace.h
@@ -59,7 +59,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QString;
 class QPlaceIcon;
diff --git a/src/plugins/geoservices/nokia/places/qplacecategoriesrepository.h b/src/plugins/geoservices/nokia/places/qplacecategoriesrepository.h
index 6bd65dc1..e88ca818 100644
--- a/src/plugins/geoservices/nokia/places/qplacecategoriesrepository.h
+++ b/src/plugins/geoservices/nokia/places/qplacecategoriesrepository.h
@@ -62,7 +62,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Location)
+
 
 class QPlaceCategoriesRepository : public QObject
 {