make QtLocation work while Qt is compiled with namespace

Task-number: QTBUG-19972

118 files changed, 257 insertions, 262 deletions

diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp
index 1a1767ca..94b44873 100644
--- a/src/location/maps/qgeomaneuver.cpp
+++ b/src/location/maps/qgeomaneuver.cpp
@@ -44,7 +44,7 @@
 
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoManeuver
@@ -318,4 +318,4 @@ bool QGeoManeuverPrivate::operator ==(const QGeoManeuverPrivate &other) const
             && (waypoint == other.waypoint));
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h
index a50af961..83245ede 100644
--- a/src/location/maps/qgeomaneuver.h
+++ b/src/location/maps/qgeomaneuver.h
@@ -46,11 +46,11 @@
 
 #include <QExplicitlySharedDataPointer>
 
-class QString;
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
+class QString;
 
 class QGeoCoordinate;
 class QGeoManeuverPrivate;
@@ -107,7 +107,7 @@ private:
     QExplicitlySharedDataPointer<QGeoManeuverPrivate> d_ptr;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/maps/qgeomaneuver_p.h b/src/location/maps/qgeomaneuver_p.h
index ae8bc043..2e176e0c 100644
--- a/src/location/maps/qgeomaneuver_p.h
+++ b/src/location/maps/qgeomaneuver_p.h
@@ -59,7 +59,7 @@
 #include <QSharedData>
 #include <QString>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoManeuverPrivate : public QSharedData
 {
@@ -80,6 +80,6 @@ public:
     QGeoCoordinate waypoint;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapcircleobject.cpp b/src/location/maps/qgeomapcircleobject.cpp
index c8767cab..9da75184 100644
--- a/src/location/maps/qgeomapcircleobject.cpp
+++ b/src/location/maps/qgeomapcircleobject.cpp
@@ -46,7 +46,7 @@
 
 #include <QDebug>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapCircleObject
@@ -336,5 +336,5 @@ QGeoMapCircleObjectPrivate::~QGeoMapCircleObjectPrivate()
 
 #include "moc_qgeomapcircleobject.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeomapcircleobject.h b/src/location/maps/qgeomapcircleobject.h
index b253ed8b..5fce4504 100644
--- a/src/location/maps/qgeomapcircleobject.h
+++ b/src/location/maps/qgeomapcircleobject.h
@@ -48,7 +48,7 @@
 #include <QPen>
 #include <QBrush>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoBoundingCircle;
@@ -103,7 +103,7 @@ private:
     Q_DISABLE_COPY(QGeoMapCircleObject)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(qreal)
 
diff --git a/src/location/maps/qgeomapcircleobject_p.h b/src/location/maps/qgeomapcircleobject_p.h
index 66ba98f5..565f6b3c 100644
--- a/src/location/maps/qgeomapcircleobject_p.h
+++ b/src/location/maps/qgeomapcircleobject_p.h
@@ -47,7 +47,7 @@
 
 #include "qgeoboundingcircle.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapCircleObjectPrivate
 {
@@ -61,6 +61,6 @@ public:
     quint32 pointCount;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapcustomobject.cpp b/src/location/maps/qgeomapcustomobject.cpp
index 9a92fbfd..77203818 100644
--- a/src/location/maps/qgeomapcustomobject.cpp
+++ b/src/location/maps/qgeomapcustomobject.cpp
@@ -45,7 +45,7 @@
 
 #include <QGraphicsItem>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapCustomObject
@@ -290,5 +290,5 @@ QGeoMapCustomObjectPrivate::~QGeoMapCustomObjectPrivate()
 
 #include "moc_qgeomapcustomobject.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeomapcustomobject.h b/src/location/maps/qgeomapcustomobject.h
index 66ae0a9a..a79e5b89 100644
--- a/src/location/maps/qgeomapcustomobject.h
+++ b/src/location/maps/qgeomapcustomobject.h
@@ -49,7 +49,7 @@
 
 #include <QGraphicsItem>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapCustomObjectPrivate;
 
@@ -89,6 +89,6 @@ private:
     Q_DISABLE_COPY(QGeoMapCustomObject)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapcustomobject_p.h b/src/location/maps/qgeomapcustomobject_p.h
index fe292066..5387f193 100644
--- a/src/location/maps/qgeomapcustomobject_p.h
+++ b/src/location/maps/qgeomapcustomobject_p.h
@@ -46,10 +46,10 @@
 
 #include <QPoint>
 
-class QGraphicsItem;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QGraphicsItem;
 class QGeoMapCustomObjectPrivate
 {
 public:
@@ -60,6 +60,6 @@ public:
     QPoint offset;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp
index c4e0fdf1..795daa63 100644
--- a/src/location/maps/qgeomapdata.cpp
+++ b/src/location/maps/qgeomapdata.cpp
@@ -63,7 +63,7 @@
 #include "qgeomapobject_p.h"
 #include <private/projwrapper_p.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapData
@@ -833,4 +833,4 @@ void QGeoMapDataPrivate::emitUpdateMapDisplay(const QRectF &target)
 #include "moc_qgeomapdata.cpp"
 #include "moc_qgeomapdata_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomapdata.h b/src/location/maps/qgeomapdata.h
index 5747fc57..20a22a24 100644
--- a/src/location/maps/qgeomapdata.h
+++ b/src/location/maps/qgeomapdata.h
@@ -50,7 +50,7 @@
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoBoundingBox;
@@ -166,6 +166,6 @@ private:
     friend class QGeoMapGroupObject;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapdata_p.h b/src/location/maps/qgeomapdata_p.h
index 3189799d..1bd1ccc5 100644
--- a/src/location/maps/qgeomapdata_p.h
+++ b/src/location/maps/qgeomapdata_p.h
@@ -62,7 +62,7 @@
 #include <private/projwrapper_p.h>
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMappingManagerEngine;
 class QGeoMapObjectEngine;
@@ -105,6 +105,6 @@ private:
     Q_DISABLE_COPY(QGeoMapDataPrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapgroupobject.cpp b/src/location/maps/qgeomapgroupobject.cpp
index 32101096..07b19441 100644
--- a/src/location/maps/qgeomapgroupobject.cpp
+++ b/src/location/maps/qgeomapgroupobject.cpp
@@ -51,7 +51,7 @@
 #include "qgeomapdata.h"
 #include "qgeomapdata_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapGroupObject
@@ -312,5 +312,5 @@ void QGeoMapGroupObjectPrivate::childChangedZValue(int zValue)
 #include "moc_qgeomapgroupobject.cpp"
 #include "moc_qgeomapgroupobject_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeomapgroupobject.h b/src/location/maps/qgeomapgroupobject.h
index 5329deec..364e01fd 100644
--- a/src/location/maps/qgeomapgroupobject.h
+++ b/src/location/maps/qgeomapgroupobject.h
@@ -44,7 +44,7 @@
 
 #include "qgeomapobject.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoBoundingBox;
@@ -82,6 +82,6 @@ private:
     Q_DISABLE_COPY(QGeoMapGroupObject)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapgroupobject_p.h b/src/location/maps/qgeomapgroupobject_p.h
index 40d67fa6..9971b533 100644
--- a/src/location/maps/qgeomapgroupobject_p.h
+++ b/src/location/maps/qgeomapgroupobject_p.h
@@ -47,7 +47,7 @@
 #include <QObject>
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapGroupObject;
 
@@ -68,6 +68,6 @@ private:
     QGeoMapGroupObject *q_ptr;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapobject.cpp b/src/location/maps/qgeomapobject.cpp
index 257dbc07..3f0b3993 100644
--- a/src/location/maps/qgeomapobject.cpp
+++ b/src/location/maps/qgeomapobject.cpp
@@ -51,7 +51,7 @@
 
 #include <QtAlgorithms>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapObject
@@ -531,4 +531,4 @@ QGeoMapObjectPrivate::~QGeoMapObjectPrivate()
 
 #include "moc_qgeomapobject.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomapobject.h b/src/location/maps/qgeomapobject.h
index a8b76969..11e40b25 100644
--- a/src/location/maps/qgeomapobject.h
+++ b/src/location/maps/qgeomapobject.h
@@ -47,11 +47,11 @@
 #include <QList>
 #include <QObject>
 
+QT_BEGIN_NAMESPACE
 class QPainter;
 class QRectF;
 class QGraphicsItem;
 
-QTM_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoBoundingBox;
@@ -149,6 +149,6 @@ private:
     friend class QGeoMapGroupObject;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapobject_p.h b/src/location/maps/qgeomapobject_p.h
index b67931c3..0d0c160a 100644
--- a/src/location/maps/qgeomapobject_p.h
+++ b/src/location/maps/qgeomapobject_p.h
@@ -57,10 +57,10 @@
 #include "qgeomapobjectinfo.h"
 #include "qgeocoordinate.h"
 
-class QGraphicsItem;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QGraphicsItem;
 class QGeoMapObject;
 class QGeoMapData;
 
@@ -85,6 +85,6 @@ public:
     Q_DISABLE_COPY(QGeoMapObjectPrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapobjectengine_p.cpp b/src/location/maps/qgeomapobjectengine_p.cpp
index e21ee6d9..e40f07f4 100644
--- a/src/location/maps/qgeomapobjectengine_p.cpp
+++ b/src/location/maps/qgeomapobjectengine_p.cpp
@@ -58,7 +58,7 @@
 
 #include <QDebug>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*
   A quick note about how the transforms are set up:
@@ -1176,4 +1176,4 @@ QGraphicsItem* QGeoMapObjectEngine::graphicsItemFromMapObject(QGeoMapObject *obj
 
 #include "moc_qgeomapobjectengine_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomapobjectengine_p.h b/src/location/maps/qgeomapobjectengine_p.h
index 6b60081a..91d0bc97 100644
--- a/src/location/maps/qgeomapobjectengine_p.h
+++ b/src/location/maps/qgeomapobjectengine_p.h
@@ -62,11 +62,11 @@
 #include <QHash>
 #include <QList>
 
+QT_BEGIN_NAMESPACE
 class QTransform;
 class QGraphicsItem;
 class QGraphicsScene;
 
-QTM_BEGIN_NAMESPACE
 
 class QGeoMapObjectEngine : public QObject
 {
@@ -170,6 +170,6 @@ private:
     Q_DISABLE_COPY(QGeoMapObjectEngine)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QGEOMAPOBJECTENGINE_P_H
diff --git a/src/location/maps/qgeomapobjectinfo.cpp b/src/location/maps/qgeomapobjectinfo.cpp
index 26484e3c..eeefcb8a 100644
--- a/src/location/maps/qgeomapobjectinfo.cpp
+++ b/src/location/maps/qgeomapobjectinfo.cpp
@@ -48,7 +48,7 @@
 #include "qgeomapobject_p.h"
 #include "qgeoboundingbox.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapObjectInfo
@@ -261,4 +261,4 @@ QGeoMapObjectInfoPrivate::~QGeoMapObjectInfoPrivate() {}
 
 #include "moc_qgeomapobjectinfo.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomapobjectinfo.h b/src/location/maps/qgeomapobjectinfo.h
index 7e034923..f9fafa7c 100644
--- a/src/location/maps/qgeomapobjectinfo.h
+++ b/src/location/maps/qgeomapobjectinfo.h
@@ -48,7 +48,7 @@
 #include <QObject>
 #include <QSizeF>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoBoundingBox;
@@ -92,6 +92,6 @@ private:
     Q_DISABLE_COPY(QGeoMapObjectInfo)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapobjectinfo_p.h b/src/location/maps/qgeomapobjectinfo_p.h
index 88272495..646f6355 100644
--- a/src/location/maps/qgeomapobjectinfo_p.h
+++ b/src/location/maps/qgeomapobjectinfo_p.h
@@ -55,7 +55,7 @@
 
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapObject;
 class QGeoMapData;
@@ -73,6 +73,6 @@ private:
     Q_DISABLE_COPY(QGeoMapObjectInfoPrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapoverlay.cpp b/src/location/maps/qgeomapoverlay.cpp
index 6d3f5a04..8ee2e80d 100644
--- a/src/location/maps/qgeomapoverlay.cpp
+++ b/src/location/maps/qgeomapoverlay.cpp
@@ -44,7 +44,7 @@
 
 #include "qgeomapdata.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapOverlay
@@ -111,4 +111,4 @@ QGeoMapOverlayPrivate::~QGeoMapOverlayPrivate() {}
 /*******************************************************************************
 *******************************************************************************/
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomapoverlay.h b/src/location/maps/qgeomapoverlay.h
index 0d807ad6..2e887282 100644
--- a/src/location/maps/qgeomapoverlay.h
+++ b/src/location/maps/qgeomapoverlay.h
@@ -47,11 +47,11 @@
 #include <QList>
 #include <QObject>
 
+QT_BEGIN_NAMESPACE
+
 class QPainter;
 class QStyleOptionGraphicsItem;
 
-QTM_BEGIN_NAMESPACE
-
 class QGeoMapData;
 class QGeoMapOverlayPrivate;
 
@@ -76,6 +76,6 @@ private:
     friend class QGeoMapData;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomapoverlay_p.h b/src/location/maps/qgeomapoverlay_p.h
index 585a4b81..491006b1 100644
--- a/src/location/maps/qgeomapoverlay_p.h
+++ b/src/location/maps/qgeomapoverlay_p.h
@@ -55,7 +55,7 @@
 
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapData;
 
@@ -71,6 +71,6 @@ private:
     Q_DISABLE_COPY(QGeoMapOverlayPrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp
index 874095bf..23027fa8 100644
--- a/src/location/maps/qgeomappingmanager.cpp
+++ b/src/location/maps/qgeomappingmanager.cpp
@@ -46,7 +46,7 @@
 #include <QNetworkProxy>
 #include <QLocale>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMappingManager
@@ -261,4 +261,4 @@ QGeoMappingManagerPrivate::~QGeoMappingManagerPrivate()
 
 #include "moc_qgeomappingmanager.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h
index 9baae007..d2e51b32 100644
--- a/src/location/maps/qgeomappingmanager.h
+++ b/src/location/maps/qgeomappingmanager.h
@@ -48,9 +48,9 @@
 #include <QSize>
 #include <QPair>
 
-class QLocale;
+QT_BEGIN_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+class QLocale;
 
 class QGeoBoundingBox;
 class QGeoCoordinate;
@@ -98,6 +98,6 @@ private:
     friend class QGeoServiceProvider;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomappingmanager_p.h b/src/location/maps/qgeomappingmanager_p.h
index a542f255..fa0cbbca 100644
--- a/src/location/maps/qgeomappingmanager_p.h
+++ b/src/location/maps/qgeomappingmanager_p.h
@@ -58,7 +58,7 @@
 #include <QSize>
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMappingManagerEngine;
 
@@ -74,6 +74,6 @@ private:
     Q_DISABLE_COPY(QGeoMappingManagerPrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp
index d063205e..fd6c8c47 100644
--- a/src/location/maps/qgeomappingmanagerengine.cpp
+++ b/src/location/maps/qgeomappingmanagerengine.cpp
@@ -44,7 +44,7 @@
 
 #include <QNetworkProxy>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMappingManagerEngine
@@ -428,4 +428,4 @@ QGeoMappingManagerEnginePrivate::~QGeoMappingManagerEnginePrivate() {}
 
 #include "moc_qgeomappingmanagerengine.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h
index faba70be..f8dd9872 100644
--- a/src/location/maps/qgeomappingmanagerengine.h
+++ b/src/location/maps/qgeomappingmanagerengine.h
@@ -48,9 +48,9 @@
 #include <QSize>
 #include <QPair>
 
-class QLocale;
+QT_BEGIN_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+class QLocale;
 
 class QGeoBoundingBox;
 class QGeoCoordinate;
@@ -119,6 +119,6 @@ private:
     friend class QGeoServiceProvider;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h
index 0129a565..95decae5 100644
--- a/src/location/maps/qgeomappingmanagerengine_p.h
+++ b/src/location/maps/qgeomappingmanagerengine_p.h
@@ -59,7 +59,7 @@
 #include <QList>
 #include <QLocale>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMappingManagerEnginePrivate
 {
@@ -86,6 +86,6 @@ private:
     Q_DISABLE_COPY(QGeoMappingManagerEnginePrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomappixmapobject.cpp b/src/location/maps/qgeomappixmapobject.cpp
index 80577752..3b5a6a74 100644
--- a/src/location/maps/qgeomappixmapobject.cpp
+++ b/src/location/maps/qgeomappixmapobject.cpp
@@ -43,7 +43,7 @@
 #include "qgeomappixmapobject_p.h"
 #include "qgeoboundingbox.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapPixmapObject
@@ -218,5 +218,5 @@ QGeoMapPixmapObjectPrivate::~QGeoMapPixmapObjectPrivate() {}
 
 #include "moc_qgeomappixmapobject.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeomappixmapobject.h b/src/location/maps/qgeomappixmapobject.h
index 5d2562a8..6a3ac825 100644
--- a/src/location/maps/qgeomappixmapobject.h
+++ b/src/location/maps/qgeomappixmapobject.h
@@ -48,7 +48,7 @@
 #include <QPixmap>
 #include <QPoint>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapPixmapObjectPrivate;
 
@@ -86,6 +86,6 @@ private:
     Q_DISABLE_COPY(QGeoMapPixmapObject)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomappixmapobject_p.h b/src/location/maps/qgeomappixmapobject_p.h
index d1b90cc1..9f6166fd 100644
--- a/src/location/maps/qgeomappixmapobject_p.h
+++ b/src/location/maps/qgeomappixmapobject_p.h
@@ -47,7 +47,7 @@
 #include <QPixmap>
 #include <QPoint>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapPixmapObjectPrivate
 {
@@ -59,6 +59,6 @@ public:
     QPoint offset;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomappolygonobject.cpp b/src/location/maps/qgeomappolygonobject.cpp
index 48293016..d82aba18 100644
--- a/src/location/maps/qgeomappolygonobject.cpp
+++ b/src/location/maps/qgeomappolygonobject.cpp
@@ -44,7 +44,7 @@
 
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapPolygonObject
@@ -208,5 +208,5 @@ QGeoMapPolygonObjectPrivate::~QGeoMapPolygonObjectPrivate() {}
 
 #include "moc_qgeomappolygonobject.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeomappolygonobject.h b/src/location/maps/qgeomappolygonobject.h
index 23ef5d62..a293f0af 100644
--- a/src/location/maps/qgeomappolygonobject.h
+++ b/src/location/maps/qgeomappolygonobject.h
@@ -48,7 +48,7 @@
 #include <QPen>
 #include <QBrush>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapPolygonObjectPrivate;
 
@@ -85,6 +85,6 @@ private:
     Q_DISABLE_COPY(QGeoMapPolygonObject)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomappolygonobject_p.h b/src/location/maps/qgeomappolygonobject_p.h
index 48f6273a..c8bf4509 100644
--- a/src/location/maps/qgeomappolygonobject_p.h
+++ b/src/location/maps/qgeomappolygonobject_p.h
@@ -48,7 +48,7 @@
 #include <QPen>
 #include <QBrush>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapPolygonObjectPrivate
 {
@@ -61,6 +61,6 @@ public:
     QBrush brush;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomappolylineobject.cpp b/src/location/maps/qgeomappolylineobject.cpp
index 8dabe004..bb3c501c 100644
--- a/src/location/maps/qgeomappolylineobject.cpp
+++ b/src/location/maps/qgeomappolylineobject.cpp
@@ -44,7 +44,7 @@
 
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapPolylineObject
@@ -174,5 +174,5 @@ QGeoMapPolylineObjectPrivate::~QGeoMapPolylineObjectPrivate() {}
 
 #include "moc_qgeomappolylineobject.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeomappolylineobject.h b/src/location/maps/qgeomappolylineobject.h
index bfaef47c..ec343841 100644
--- a/src/location/maps/qgeomappolylineobject.h
+++ b/src/location/maps/qgeomappolylineobject.h
@@ -47,7 +47,7 @@
 #include <QList>
 #include <QPen>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 
@@ -81,6 +81,6 @@ private:
     Q_DISABLE_COPY(QGeoMapPolylineObject)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomappolylineobject_p.h b/src/location/maps/qgeomappolylineobject_p.h
index c27afbfd..845b7953 100644
--- a/src/location/maps/qgeomappolylineobject_p.h
+++ b/src/location/maps/qgeomappolylineobject_p.h
@@ -47,7 +47,7 @@
 #include <QList>
 #include <QPen>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapPolylineObjectPrivate
 {
@@ -59,6 +59,6 @@ public:
     QPen pen;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomaprectangleobject.cpp b/src/location/maps/qgeomaprectangleobject.cpp
index ef336f57..4712ce8b 100644
--- a/src/location/maps/qgeomaprectangleobject.cpp
+++ b/src/location/maps/qgeomaprectangleobject.cpp
@@ -45,7 +45,7 @@
 #include "qgeocoordinate.h"
 #include "qgeoboundingbox.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapRectangleObject
@@ -295,5 +295,5 @@ QGeoMapRectangleObjectPrivate::~QGeoMapRectangleObjectPrivate() {}
 
 #include "moc_qgeomaprectangleobject.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeomaprectangleobject.h b/src/location/maps/qgeomaprectangleobject.h
index 7c096a56..6f24450f 100644
--- a/src/location/maps/qgeomaprectangleobject.h
+++ b/src/location/maps/qgeomaprectangleobject.h
@@ -47,7 +47,7 @@
 #include <QPen>
 #include <QBrush>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapRectangleObjectPrivate;
 class QGeoBoundingBox;
@@ -96,6 +96,6 @@ private:
     Q_DISABLE_COPY(QGeoMapRectangleObject)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomaprectangleobject_p.h b/src/location/maps/qgeomaprectangleobject_p.h
index fc30de02..814dc2fb 100644
--- a/src/location/maps/qgeomaprectangleobject_p.h
+++ b/src/location/maps/qgeomaprectangleobject_p.h
@@ -47,7 +47,7 @@
 #include <QPen>
 #include <QBrush>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapRectangleObjectPrivate
 {
@@ -60,6 +60,6 @@ public:
     QBrush brush;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomaprouteobject.cpp b/src/location/maps/qgeomaprouteobject.cpp
index 08e038fb..462d98f0 100644
--- a/src/location/maps/qgeomaprouteobject.cpp
+++ b/src/location/maps/qgeomaprouteobject.cpp
@@ -46,7 +46,7 @@
 
 #define DEFAULT_ROUTE_DETAIL_LEVEL 6
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapRouteObject
@@ -220,5 +220,5 @@ QGeoMapRouteObjectPrivate::~QGeoMapRouteObjectPrivate() {}
 
 #include "moc_qgeomaprouteobject.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeomaprouteobject.h b/src/location/maps/qgeomaprouteobject.h
index bc649742..7ea74723 100644
--- a/src/location/maps/qgeomaprouteobject.h
+++ b/src/location/maps/qgeomaprouteobject.h
@@ -47,7 +47,7 @@
 
 #include <QPen>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapRouteObjectPrivate;
 class QGeoRoute;
@@ -87,6 +87,6 @@ private:
     Q_DISABLE_COPY(QGeoMapRouteObject)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomaprouteobject_p.h b/src/location/maps/qgeomaprouteobject_p.h
index 01fc0047..4d5fca57 100644
--- a/src/location/maps/qgeomaprouteobject_p.h
+++ b/src/location/maps/qgeomaprouteobject_p.h
@@ -46,7 +46,7 @@
 
 #include <QPen>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapRouteObjectPrivate
 {
@@ -59,6 +59,6 @@ public:
     quint32 detailLevel;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomaptextobject.cpp b/src/location/maps/qgeomaptextobject.cpp
index ca56da9e..68cbc154 100644
--- a/src/location/maps/qgeomaptextobject.cpp
+++ b/src/location/maps/qgeomaptextobject.cpp
@@ -42,7 +42,7 @@
 #include "qgeomaptextobject.h"
 #include "qgeomaptextobject_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoMapTextObject
@@ -371,5 +371,5 @@ QGeoMapTextObjectPrivate::~QGeoMapTextObjectPrivate() {}
 
 #include "moc_qgeomaptextobject.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeomaptextobject.h b/src/location/maps/qgeomaptextobject.h
index 3d14bb0e..0447aea4 100644
--- a/src/location/maps/qgeomaptextobject.h
+++ b/src/location/maps/qgeomaptextobject.h
@@ -48,7 +48,7 @@
 #include <QFont>
 #include <QPoint>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapTextObjectPrivate;
 
@@ -110,6 +110,6 @@ private:
     Q_DISABLE_COPY(QGeoMapTextObject)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeomaptextobject_p.h b/src/location/maps/qgeomaptextobject_p.h
index e312b1a5..4c1a7101 100644
--- a/src/location/maps/qgeomaptextobject_p.h
+++ b/src/location/maps/qgeomaptextobject_p.h
@@ -49,7 +49,7 @@
 #include <QPen>
 #include <QBrush>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapTextObjectPrivate
 {
@@ -65,6 +65,6 @@ public:
     Qt::Alignment alignment;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeoroute.cpp b/src/location/maps/qgeoroute.cpp
index 8fb2e1b9..933a840b 100644
--- a/src/location/maps/qgeoroute.cpp
+++ b/src/location/maps/qgeoroute.cpp
@@ -47,7 +47,7 @@
 
 #include <QDateTime>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoRoute
@@ -320,4 +320,4 @@ bool QGeoRoutePrivate::operator ==(const QGeoRoutePrivate &other) const
             && (path == other.path));
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h
index 151fbc86..eca734dd 100644
--- a/src/location/maps/qgeoroute.h
+++ b/src/location/maps/qgeoroute.h
@@ -51,7 +51,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoBoundingBox;
 class QGeoRouteSegment;
@@ -98,7 +98,7 @@ private:
     QExplicitlySharedDataPointer<QGeoRoutePrivate> d_ptr;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/maps/qgeoroute_p.h b/src/location/maps/qgeoroute_p.h
index 0c382ebd..c039c1d1 100644
--- a/src/location/maps/qgeoroute_p.h
+++ b/src/location/maps/qgeoroute_p.h
@@ -60,7 +60,7 @@
 
 #include <QSharedData>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 
@@ -89,6 +89,6 @@ public:
     QGeoRouteSegment firstSegment;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeoroutereply.cpp b/src/location/maps/qgeoroutereply.cpp
index af3a10d6..f4c0e840 100644
--- a/src/location/maps/qgeoroutereply.cpp
+++ b/src/location/maps/qgeoroutereply.cpp
@@ -42,7 +42,7 @@
 #include "qgeoroutereply.h"
 #include "qgeoroutereply_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoRouteReply
@@ -268,4 +268,4 @@ QGeoRouteReplyPrivate::~QGeoRouteReplyPrivate() {}
 
 #include "moc_qgeoroutereply.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index 1dfc3188..f331c766 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -49,7 +49,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoRouteRequest;
 class QGeoRouteReplyPrivate;
@@ -96,7 +96,7 @@ private:
     Q_DISABLE_COPY(QGeoRouteReply)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/maps/qgeoroutereply_p.h b/src/location/maps/qgeoroutereply_p.h
index 1eb9dfe8..b489fdd8 100644
--- a/src/location/maps/qgeoroutereply_p.h
+++ b/src/location/maps/qgeoroutereply_p.h
@@ -58,7 +58,7 @@
 
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoRoute;
 
@@ -80,6 +80,6 @@ private:
     Q_DISABLE_COPY(QGeoRouteReplyPrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeorouterequest.cpp b/src/location/maps/qgeorouterequest.cpp
index 955c54e7..55e454bb 100644
--- a/src/location/maps/qgeorouterequest.cpp
+++ b/src/location/maps/qgeorouterequest.cpp
@@ -45,7 +45,7 @@
 #include "qgeocoordinate.h"
 #include "qgeoboundingbox.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoRouteRequest
@@ -485,4 +485,4 @@ bool QGeoRouteRequestPrivate::operator ==(const QGeoRouteRequestPrivate &other)
             && (maneuverDetail == other.maneuverDetail));
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h
index 8fe9f1bf..cdca8989 100644
--- a/src/location/maps/qgeorouterequest.h
+++ b/src/location/maps/qgeorouterequest.h
@@ -50,7 +50,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoBoundingBox;
@@ -163,7 +163,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::RouteOptimizations)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::SegmentDetails)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::ManeuverDetails)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/maps/qgeorouterequest_p.h b/src/location/maps/qgeorouterequest_p.h
index 4152255d..d06d458e 100644
--- a/src/location/maps/qgeorouterequest_p.h
+++ b/src/location/maps/qgeorouterequest_p.h
@@ -60,7 +60,7 @@
 #include <QDateTime>
 #include <QMap>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoRouteRequestPrivate : public QSharedData
 {
@@ -82,6 +82,6 @@ public:
     QGeoRouteRequest::ManeuverDetail maneuverDetail;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeoroutesegment.cpp b/src/location/maps/qgeoroutesegment.cpp
index ab24e854..ff6f5257 100644
--- a/src/location/maps/qgeoroutesegment.cpp
+++ b/src/location/maps/qgeoroutesegment.cpp
@@ -45,7 +45,7 @@
 #include "qgeocoordinate.h"
 #include <QDateTime>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoRouteSegment
@@ -273,5 +273,5 @@ bool QGeoRouteSegmentPrivate::operator ==(const QGeoRouteSegmentPrivate &other)
 /*******************************************************************************
 *******************************************************************************/
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h
index 6b910d20..2396f28c 100644
--- a/src/location/maps/qgeoroutesegment.h
+++ b/src/location/maps/qgeoroutesegment.h
@@ -49,7 +49,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoManeuver;
@@ -92,7 +92,7 @@ private:
     QExplicitlySharedDataPointer<QGeoRouteSegmentPrivate> d_ptr;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/maps/qgeoroutesegment_p.h b/src/location/maps/qgeoroutesegment_p.h
index 4d150e91..c4e45ff4 100644
--- a/src/location/maps/qgeoroutesegment_p.h
+++ b/src/location/maps/qgeoroutesegment_p.h
@@ -59,7 +59,7 @@
 #include <QList>
 #include <QString>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 
@@ -82,6 +82,6 @@ public:
     QExplicitlySharedDataPointer<QGeoRouteSegmentPrivate> nextSegment;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeoroutingmanager.cpp b/src/location/maps/qgeoroutingmanager.cpp
index a9dcd56d..27ebd904 100644
--- a/src/location/maps/qgeoroutingmanager.cpp
+++ b/src/location/maps/qgeoroutingmanager.cpp
@@ -45,7 +45,7 @@
 
 #include <QLocale>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoRoutingManager
@@ -416,4 +416,4 @@ QGeoRoutingManagerPrivate::~QGeoRoutingManagerPrivate()
 
 #include "moc_qgeoroutingmanager.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index 15d3c762..66bafeaa 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -48,9 +48,9 @@
 #include <QObject>
 #include <QMap>
 
-class QLocale;
+QT_BEGIN_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+class QLocale;
 
 class QGeoRoutingManagerEngine;
 class QGeoRoutingManagerPrivate;
@@ -93,6 +93,6 @@ private:
     friend class QGeoServiceProvider;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeoroutingmanager_p.h b/src/location/maps/qgeoroutingmanager_p.h
index c35fb440..393b335b 100644
--- a/src/location/maps/qgeoroutingmanager_p.h
+++ b/src/location/maps/qgeoroutingmanager_p.h
@@ -55,7 +55,7 @@
 
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoRoutingManagerEngine;
 
@@ -71,6 +71,6 @@ private:
     Q_DISABLE_COPY(QGeoRoutingManagerPrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp
index ac6d0316..beac9604 100644
--- a/src/location/maps/qgeoroutingmanagerengine.cpp
+++ b/src/location/maps/qgeoroutingmanagerengine.cpp
@@ -42,7 +42,7 @@
 #include "qgeoroutingmanagerengine.h"
 #include "qgeoroutingmanagerengine_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoRoutingManagerEngine
@@ -465,4 +465,4 @@ QGeoRoutingManagerEnginePrivate::~QGeoRoutingManagerEnginePrivate() {}
 
 #include "moc_qgeoroutingmanagerengine.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index 7ebc77bb..a38d3f08 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -48,9 +48,9 @@
 #include <QObject>
 #include <QMap>
 
-class QLocale;
+QT_BEGIN_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+class QLocale;
 
 class QGeoRoutingManagerEnginePrivate;
 
@@ -105,6 +105,6 @@ private:
     friend class QGeoServiceProvider;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeoroutingmanagerengine_p.h b/src/location/maps/qgeoroutingmanagerengine_p.h
index 63afc8dc..1b26aa0b 100644
--- a/src/location/maps/qgeoroutingmanagerengine_p.h
+++ b/src/location/maps/qgeoroutingmanagerengine_p.h
@@ -58,7 +58,7 @@
 #include <QMap>
 #include <QLocale>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoRoutingManagerEnginePrivate
 {
@@ -85,6 +85,6 @@ private:
     Q_DISABLE_COPY(QGeoRoutingManagerEnginePrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeosearchmanager.cpp b/src/location/maps/qgeosearchmanager.cpp
index 8427e2cd..f3818123 100644
--- a/src/location/maps/qgeosearchmanager.cpp
+++ b/src/location/maps/qgeosearchmanager.cpp
@@ -56,7 +56,7 @@
 
 #include <QLocale>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoSearchManager
@@ -679,4 +679,4 @@ void QGeoCombiningSearchReply::landmarkFetchStateChanged(QLandmarkAbstractReques
 #include "moc_qgeosearchmanager.cpp"
 #include "moc_qgeosearchmanager_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeosearchmanager.h b/src/location/maps/qgeosearchmanager.h
index 5e8ed924..a4a024a8 100644
--- a/src/location/maps/qgeosearchmanager.h
+++ b/src/location/maps/qgeosearchmanager.h
@@ -49,10 +49,9 @@
 #include <QList>
 #include <QMap>
 
+QT_BEGIN_NAMESPACE
 class QLocale;
 
-QTM_BEGIN_NAMESPACE
-
 class QLandmarkManager;
 
 class QGeoSearchManagerEngine;
@@ -114,6 +113,6 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoSearchManager::SearchTypes)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeosearchmanager_p.h b/src/location/maps/qgeosearchmanager_p.h
index c946cbb8..946e1dbc 100644
--- a/src/location/maps/qgeosearchmanager_p.h
+++ b/src/location/maps/qgeosearchmanager_p.h
@@ -60,7 +60,7 @@
 
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkManager;
 class QGeoSearchManagerEngine;
@@ -95,7 +95,7 @@ private:
     QList<QLandmarkFetchRequest*> fetchRequests;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
 
diff --git a/src/location/maps/qgeosearchmanagerengine.cpp b/src/location/maps/qgeosearchmanagerengine.cpp
index 74af9b8f..5a6a8a47 100644
--- a/src/location/maps/qgeosearchmanagerengine.cpp
+++ b/src/location/maps/qgeosearchmanagerengine.cpp
@@ -46,7 +46,7 @@
 #include "qgeocoordinate.h"
 #include "qlandmarkmanager.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoSearchManagerEngine
@@ -512,4 +512,4 @@ QGeoSearchManagerEnginePrivate::~QGeoSearchManagerEnginePrivate()
 
 #include "moc_qgeosearchmanagerengine.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeosearchmanagerengine.h b/src/location/maps/qgeosearchmanagerengine.h
index 7cdf38fb..86b14165 100644
--- a/src/location/maps/qgeosearchmanagerengine.h
+++ b/src/location/maps/qgeosearchmanagerengine.h
@@ -49,7 +49,7 @@
 #include <QObject>
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkManager;
 
@@ -109,6 +109,6 @@ private:
     friend class QGeoServiceProvider;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeosearchmanagerengine_p.h b/src/location/maps/qgeosearchmanagerengine_p.h
index cb4fe592..488c9a35 100644
--- a/src/location/maps/qgeosearchmanagerengine_p.h
+++ b/src/location/maps/qgeosearchmanagerengine_p.h
@@ -58,7 +58,7 @@
 #include <QList>
 #include <QLocale>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkManager;
 
@@ -84,6 +84,6 @@ private:
     Q_DISABLE_COPY(QGeoSearchManagerEnginePrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeosearchreply.cpp b/src/location/maps/qgeosearchreply.cpp
index 371123b1..42fc0d11 100644
--- a/src/location/maps/qgeosearchreply.cpp
+++ b/src/location/maps/qgeosearchreply.cpp
@@ -42,7 +42,7 @@
 #include "qgeosearchreply.h"
 #include "qgeosearchreply_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 /*!
     \class QGeoSearchReply
 
@@ -341,4 +341,4 @@ QGeoSearchReplyPrivate::~QGeoSearchReplyPrivate() {}
 
 #include "moc_qgeosearchreply.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeosearchreply.h b/src/location/maps/qgeosearchreply.h
index 0bf53864..4da0f0f7 100644
--- a/src/location/maps/qgeosearchreply.h
+++ b/src/location/maps/qgeosearchreply.h
@@ -47,7 +47,7 @@
 #include <QObject>
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSearchReplyPrivate;
 
@@ -103,6 +103,6 @@ private:
     Q_DISABLE_COPY(QGeoSearchReply)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeosearchreply_p.h b/src/location/maps/qgeosearchreply_p.h
index 50bf9d6d..95656bf6 100644
--- a/src/location/maps/qgeosearchreply_p.h
+++ b/src/location/maps/qgeosearchreply_p.h
@@ -59,7 +59,7 @@
 
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoPlace;
 
@@ -83,6 +83,6 @@ private:
     Q_DISABLE_COPY(QGeoSearchReplyPrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index e372a4b4..bb9f3c9f 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -64,7 +64,7 @@
 
 #include "qmobilitypluginsearch.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoServiceProvider
@@ -426,5 +426,5 @@ void QGeoServiceProviderPrivate::loadStaticPlugins(QHash<QString, QGeoServicePro
     }
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h
index 825e4c03..8fbe8ee6 100644
--- a/src/location/maps/qgeoserviceprovider.h
+++ b/src/location/maps/qgeoserviceprovider.h
@@ -48,12 +48,12 @@
 #include <QVariant>
 #include <QString>
 
-class QStringList;
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QStringList;
 class QGeoSearchManager;
 class QGeoMappingManager;
 class QGeoRoutingManager;
@@ -89,7 +89,7 @@ private:
     QGeoServiceProviderPrivate* d_ptr;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h
index 5b2038dd..3d564481 100644
--- a/src/location/maps/qgeoserviceprovider_p.h
+++ b/src/location/maps/qgeoserviceprovider_p.h
@@ -57,7 +57,7 @@
 
 #include <QHash>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSearchManager;
 class QGeoRoutingManager;
@@ -97,6 +97,6 @@ public:
     static void loadStaticPlugins(QHash<QString, QGeoServiceProviderFactory*> *plugins);
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp
index 83827517..74b76e6b 100644
--- a/src/location/maps/qgeoserviceproviderfactory.cpp
+++ b/src/location/maps/qgeoserviceproviderfactory.cpp
@@ -41,7 +41,7 @@
 
 #include "qgeoserviceproviderfactory.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoServiceProviderFactory
@@ -163,4 +163,4 @@ QGeoRoutingManagerEngine* QGeoServiceProviderFactory::createRoutingManagerEngine
     return 0;
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h
index a6ddc725..1e457d7f 100644
--- a/src/location/maps/qgeoserviceproviderfactory.h
+++ b/src/location/maps/qgeoserviceproviderfactory.h
@@ -49,7 +49,7 @@
 #include <QMap>
 #include <QString>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QGeoServiceProviderFactory
 {
@@ -70,7 +70,7 @@ public:
             QString *errorString) const;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 #define QT_GEOSERVICE_BACKEND_INTERFACE "com.nokia.qt.mobility.geoservice.serviceproviderfactory/1.0"
diff --git a/src/location/maps/qgraphicsgeomap.cpp b/src/location/maps/qgraphicsgeomap.cpp
index 09484aa6..5ccad8a6 100644
--- a/src/location/maps/qgraphicsgeomap.cpp
+++ b/src/location/maps/qgraphicsgeomap.cpp
@@ -58,7 +58,7 @@
 
 #include <QDebug>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGraphicsGeoMap
@@ -818,4 +818,4 @@ QGraphicsGeoMapPrivate::~QGraphicsGeoMapPrivate()
 
 #include "moc_qgraphicsgeomap.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/qgraphicsgeomap.h b/src/location/maps/qgraphicsgeomap.h
index 03e013a7..00a47d8c 100644
--- a/src/location/maps/qgraphicsgeomap.h
+++ b/src/location/maps/qgraphicsgeomap.h
@@ -46,7 +46,7 @@
 
 #include <QGraphicsWidget>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoMappingManager;
@@ -167,6 +167,6 @@ private:
     Q_DISABLE_COPY(QGraphicsGeoMap)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/qgraphicsgeomap_p.h b/src/location/maps/qgraphicsgeomap_p.h
index 614dfb7b..c3818c99 100644
--- a/src/location/maps/qgraphicsgeomap_p.h
+++ b/src/location/maps/qgraphicsgeomap_p.h
@@ -55,7 +55,7 @@
 
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoServiceProvider;
 class QGeoMappingManager;
@@ -75,6 +75,6 @@ private:
     Q_DISABLE_COPY(QGraphicsGeoMapPrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/tiled/makepoly_p.h b/src/location/maps/tiled/makepoly_p.h
index a5389931..d8b3a852 100644
--- a/src/location/maps/tiled/makepoly_p.h
+++ b/src/location/maps/tiled/makepoly_p.h
@@ -61,7 +61,7 @@
 #include <QPolygonF>
 #include <QGraphicsPolygonItem>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 // TODO: replace boolean parameter by enum
 static inline void makepoly(QPolygonF &points, const QList<QGeoCoordinate> & path, const QGeoTiledMapDataPrivate * mapData, bool closedPath, qreal ypole = -100)
@@ -133,6 +133,6 @@ static inline void makepoly(QPolygonF &points, const QList<QGeoCoordinate> & pat
     }
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //MAKEPOLY_P_H
diff --git a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp
index 04a5d7df..2d726b2b 100644
--- a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp
@@ -50,7 +50,7 @@
 #include <QGraphicsItem>
 #include <QGraphicsEllipseItem>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapCircleObjectInfo::QGeoTiledMapCircleObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoTiledMapObjectInfo(mapData, mapObject)
@@ -103,4 +103,4 @@ void QGeoTiledMapCircleObjectInfo::brushChanged(const QBrush &brush)
 
 #include "moc_qgeotiledmapcircleobjectinfo_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h
index 7ea9b3c2..c6f07383 100644
--- a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h
+++ b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h
@@ -59,10 +59,9 @@
 #include <QPen>
 #include <QBrush>
 
-class QGraphicsEllipseItem;
-
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QGraphicsEllipseItem;
 class QGeoMapCircleObject;
 
 class QGeoTiledMapCircleObjectInfo : public QGeoTiledMapObjectInfo
@@ -81,6 +80,6 @@ public slots:
     void brushChanged(const QBrush &brush);
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //QGEOTILEDMAPCIRCLEOBJECT_INFO_P_H
diff --git a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp
index 8ce1b5c9..080df3e7 100644
--- a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp
@@ -46,7 +46,7 @@
 
 #include "qgeomapcustomobject.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapCustomObjectInfo::QGeoTiledMapCustomObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoTiledMapObjectInfo(mapData, mapObject)
@@ -97,5 +97,5 @@ void QGeoTiledMapCustomObjectInfo::offsetChanged(const QPoint &/*offset*/)
 
 #include "moc_qgeotiledmapcustomobjectinfo_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h
index 09d56f7f..cdf2c81c 100644
--- a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h
+++ b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h
@@ -60,7 +60,7 @@
 
 class QGraphicsPixmapItem;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapCustomObject;
 
@@ -79,7 +79,7 @@ public slots:
     void offsetChanged(const QPoint &offset);
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //QGEOTILEDMAPCUSTOMOBJECT_INFO_P_H
 
diff --git a/src/location/maps/tiled/qgeotiledmapdata.cpp b/src/location/maps/tiled/qgeotiledmapdata.cpp
index c421c4fb..c2eb4159 100644
--- a/src/location/maps/tiled/qgeotiledmapdata.cpp
+++ b/src/location/maps/tiled/qgeotiledmapdata.cpp
@@ -80,6 +80,8 @@
 
 #include <math.h>
 
+QT_BEGIN_NAMESPACE
+
 uint qHash(const QRectF& key)
 {
     uint result = qHash(qRound(key.x()));
@@ -89,7 +91,6 @@ uint qHash(const QRectF& key)
     return result;
 }
 
-QTM_BEGIN_NAMESPACE
 
 /*!
     \class QGeoTiledMapData
@@ -1427,4 +1428,4 @@ QGeoTiledMapRequest QGeoTileIterator::next()
 
 #include "moc_qgeotiledmapdata.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/tiled/qgeotiledmapdata.h b/src/location/maps/tiled/qgeotiledmapdata.h
index ca454b7e..5926f085 100644
--- a/src/location/maps/tiled/qgeotiledmapdata.h
+++ b/src/location/maps/tiled/qgeotiledmapdata.h
@@ -47,7 +47,7 @@
 
 #include <QRectF>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoTiledMapDataPrivate;
 
@@ -110,6 +110,6 @@ private:
     friend class QGeoTiledMapObjectInfo;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/tiled/qgeotiledmapdata_p.h b/src/location/maps/tiled/qgeotiledmapdata_p.h
index 3ff60f3a..5df38012 100644
--- a/src/location/maps/tiled/qgeotiledmapdata_p.h
+++ b/src/location/maps/tiled/qgeotiledmapdata_p.h
@@ -66,7 +66,7 @@
 
 class QGraphicsScene;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoTiledMapData;
 class QGeoTiledMapRequest;
@@ -163,6 +163,6 @@ private:
     QRect tileRect;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp
index 9782bb25..0bac17f8 100644
--- a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp
@@ -54,7 +54,7 @@
 #include <QGraphicsScene>
 #include <QGraphicsPathItem>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapGroupObjectInfo::QGeoTiledMapGroupObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoTiledMapObjectInfo(mapData, mapObject)
@@ -134,4 +134,4 @@ void QGeoTiledMapGroupObjectInfo::childRemoved(QGeoMapObject *childObject)
 
 #include "moc_qgeotiledmapgroupobjectinfo_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h
index 447fdba6..7ea3de33 100644
--- a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h
+++ b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h
@@ -55,10 +55,9 @@
 
 #include "qgeotiledmapobjectinfo_p.h"
 
+QT_BEGIN_NAMESPACE
 class QGraphicsPathItem;
 
-QTM_BEGIN_NAMESPACE
-
 class QGeoMapGroupObject;
 
 class QGeoTiledMapGroupObjectInfo : public QGeoTiledMapObjectInfo
@@ -77,6 +76,6 @@ public slots:
     void childRemoved(QGeoMapObject *childObject);
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //QGEOTILEDMAPGROUPOBJECT_INFO_P_H
diff --git a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp
index d989183f..510413d8 100644
--- a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp
@@ -52,7 +52,7 @@
 
 #include <QDebug>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapObjectInfo::QGeoTiledMapObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoMapObjectInfo(mapData, mapObject),
@@ -118,19 +118,19 @@ void QGeoTiledMapObjectInfo::selectedChanged(bool /*selected*/)
 //    }
 }
 
-void QGeoTiledMapObjectInfo::originChanged(const QGeoCoordinate &origin)
+void QGeoTiledMapObjectInfo::originChanged(const QGeoCoordinate &/*origin*/)
 {
     if (graphicsItem)
         updateItem();
 }
 
-void QGeoTiledMapObjectInfo::unitsChanged(QGeoMapObject::CoordinateUnit units)
+void QGeoTiledMapObjectInfo::unitsChanged(QGeoMapObject::CoordinateUnit /*units*/)
 {
     if (graphicsItem)
         updateItem();
 }
 
-void QGeoTiledMapObjectInfo::transformTypeChanged(QGeoMapObject::TransformType transformType)
+void QGeoTiledMapObjectInfo::transformTypeChanged(QGeoMapObject::TransformType /*transformType*/)
 {
     if (graphicsItem)
         updateItem();
@@ -255,5 +255,5 @@ void QGeoTiledMapObjectInfo::updateItem(const QRectF& target)
 
 #include "moc_qgeotiledmapobjectinfo_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h
index 65fe3792..ea1fb559 100644
--- a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h
+++ b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h
@@ -57,12 +57,12 @@
 
 #include <QRectF>
 
+QT_BEGIN_NAMESPACE
+
 class QGraphicsItem;
 class QRect;
 class QPolygonF;
 
-QTM_BEGIN_NAMESPACE
-
 class QGeoTiledMapData;
 class QGeoBoundingBox;
 class QGeoCoordinate;
@@ -103,7 +103,7 @@ protected:
     QGeoTiledMapDataPrivate *tiledMapDataPrivate;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //QGEOTILEDMAPOBJECT_INFO_P_H
 
diff --git a/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp b/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp
index 03ba0490..aedff2b6 100644
--- a/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp
+++ b/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp
@@ -42,7 +42,7 @@
 #include "qgeotiledmappingmanagerengine.h"
 #include "qgeotiledmappingmanagerengine_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoTiledMappingManagerEngine
@@ -185,4 +185,4 @@ QGeoTiledMappingManagerEnginePrivate::~QGeoTiledMappingManagerEnginePrivate() {}
 
 #include "moc_qgeotiledmappingmanagerengine.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/tiled/qgeotiledmappingmanagerengine.h b/src/location/maps/tiled/qgeotiledmappingmanagerengine.h
index aacf2d0c..975fd02a 100644
--- a/src/location/maps/tiled/qgeotiledmappingmanagerengine.h
+++ b/src/location/maps/tiled/qgeotiledmappingmanagerengine.h
@@ -51,7 +51,7 @@
 #include <QMap>
 #include <QVariant>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoTiledMappingManagerEnginePrivate;
 
@@ -76,8 +76,8 @@ private:
     Q_DISABLE_COPY(QGeoTiledMappingManagerEngine)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QGeoTiledMapReply::Error))
+Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGeoTiledMapReply::Error))
 
 #endif
diff --git a/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h b/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h
index cc76f793..fc0f89b3 100644
--- a/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h
@@ -58,7 +58,7 @@
 
 #include <QSize>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoTiledMappingManagerEngine;
 class QGeoTiledMapRequestHandler;
@@ -77,6 +77,6 @@ private:
     Q_DISABLE_COPY(QGeoTiledMappingManagerEnginePrivate)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp
index a9722196..405af88e 100644
--- a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp
@@ -46,7 +46,7 @@
 
 #include "qgeomappixmapobject.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapPixmapObjectInfo::QGeoTiledMapPixmapObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoTiledMapObjectInfo(mapData, mapObject)
@@ -92,5 +92,5 @@ void QGeoTiledMapPixmapObjectInfo::offsetChanged(const QPoint &/*offset*/)
 
 #include "moc_qgeotiledmappixmapobjectinfo_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h
index c71fda03..580346f9 100644
--- a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h
+++ b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h
@@ -58,10 +58,9 @@
 
 #include <QPixmap>
 
-class QGraphicsPixmapItem;
-
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QGraphicsPixmapItem;
 class QGeoMapPixmapObject;
 
 class QGeoTiledMapPixmapObjectInfo : public QGeoTiledMapObjectInfo
@@ -79,7 +78,7 @@ public slots:
     void offsetChanged(const QPoint &offset);
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //QGEOTILEDMAPPIXMAPOBJECT_INFO_P_H
 
diff --git a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp
index 76ba710a..02279ade 100644
--- a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp
@@ -46,7 +46,7 @@
 
 #include "qgeomappolygonobject.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapPolygonObjectInfo::QGeoTiledMapPolygonObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoTiledMapObjectInfo(mapData, mapObject)
@@ -134,5 +134,5 @@ void QGeoTiledMapPolygonObjectInfo::genPoly()
 
 #include "moc_qgeotiledmappolygonobjectinfo_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h
index 22768064..1dec8a55 100644
--- a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h
+++ b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h
@@ -59,10 +59,10 @@
 #include <QBrush>
 #include <QPolygonF>
 
-class QGraphicsPolygonItem;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QGraphicsPolygonItem;
 class QGeoMapPolygonObject;
 
 class QGeoTiledMapPolygonObjectInfo : public QGeoTiledMapObjectInfo
@@ -84,7 +84,7 @@ private:
     void genPoly();
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //QGEOTILEDMAPPOLYGONOBJECT_INFO_P_H
 
diff --git a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp
index b51b340f..3e76ce90 100644
--- a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp
@@ -49,7 +49,7 @@
 
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapPolylineObjectInfo::QGeoTiledMapPolylineObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoTiledMapObjectInfo(mapData, mapObject)
@@ -126,5 +126,5 @@ void QGeoTiledMapPolylineObjectInfo::genPath()
 
 #include "moc_qgeotiledmappolylineobjectinfo_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h
index 966dfa1d..23e33b76 100644
--- a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h
+++ b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h
@@ -58,11 +58,11 @@
 #include <QPen>
 #include <QPolygonF>
 
+QT_BEGIN_NAMESPACE
+
 class QGraphicsPathItem;
 class QPointF;
 
-QTM_BEGIN_NAMESPACE
-
 class QGeoMapPolylineObject;
 
 class QGeoTiledMapPolylineObjectInfo : public QGeoTiledMapObjectInfo
@@ -83,6 +83,6 @@ private:
     void genPath();
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //QGEOTILEDMAPPOLYLINEOBJECT_INFO_P_H
diff --git a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp
index 8622a273..7f20bab4 100644
--- a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp
@@ -50,7 +50,7 @@
 
 #include "qgeomaprectangleobject.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapRectangleObjectInfo::QGeoTiledMapRectangleObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoTiledMapObjectInfo(mapData, mapObject)
@@ -142,6 +142,6 @@ void QGeoTiledMapRectangleObjectInfo::regenPolygon()
 
 #include "moc_qgeotiledmaprectangleobjectinfo_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
diff --git a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h
index 065dda1f..b55b8479 100644
--- a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h
+++ b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h
@@ -58,9 +58,9 @@
 #include <QPen>
 #include <QBrush>
 
-class QGraphicsPolygonItem;
+QT_BEGIN_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+class QGraphicsPolygonItem;
 
 class QGeoMapRectangleObject;
 
@@ -84,7 +84,7 @@ private:
     void regenPolygon();
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //QGEOTILEDMAPRECTANGLEOBJECT_INFO_P_H
 
diff --git a/src/location/maps/tiled/qgeotiledmapreply.cpp b/src/location/maps/tiled/qgeotiledmapreply.cpp
index 1fc9b944..fc145a98 100644
--- a/src/location/maps/tiled/qgeotiledmapreply.cpp
+++ b/src/location/maps/tiled/qgeotiledmapreply.cpp
@@ -46,7 +46,7 @@
 
 #include <qdebug.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 /*!
     \class QGeoTiledMapReply
 
@@ -326,4 +326,4 @@ QGeoTiledMapReplyPrivate::~QGeoTiledMapReplyPrivate() {}
 
 #include "moc_qgeotiledmapreply.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/maps/tiled/qgeotiledmapreply.h b/src/location/maps/tiled/qgeotiledmapreply.h
index 3064b511..9b3bea4f 100644
--- a/src/location/maps/tiled/qgeotiledmapreply.h
+++ b/src/location/maps/tiled/qgeotiledmapreply.h
@@ -46,7 +46,7 @@
 
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoTiledMapRequest;
 class QGeoTiledMapReplyPrivate;
@@ -98,6 +98,6 @@ private:
     Q_DISABLE_COPY(QGeoTiledMapReply)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/tiled/qgeotiledmapreply_p.h b/src/location/maps/tiled/qgeotiledmapreply_p.h
index 23cf0247..537a23b7 100644
--- a/src/location/maps/tiled/qgeotiledmapreply_p.h
+++ b/src/location/maps/tiled/qgeotiledmapreply_p.h
@@ -56,7 +56,7 @@
 #include "qgeotiledmapreply.h"
 #include "qgeotiledmaprequest.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoTiledMapReplyPrivate
 {
@@ -75,6 +75,6 @@ public:
     QString mapImageFormat;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/tiled/qgeotiledmaprequest.cpp b/src/location/maps/tiled/qgeotiledmaprequest.cpp
index 0694dafb..cad5a7f2 100644
--- a/src/location/maps/tiled/qgeotiledmaprequest.cpp
+++ b/src/location/maps/tiled/qgeotiledmaprequest.cpp
@@ -44,7 +44,7 @@
 
 #include "qgeotiledmapdata.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoTiledMapRequest
@@ -262,5 +262,5 @@ QGeoTiledMapRequestPrivate& QGeoTiledMapRequestPrivate::operator= (const QGeoTil
     return *this;
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/tiled/qgeotiledmaprequest.h b/src/location/maps/tiled/qgeotiledmaprequest.h
index 9b048c01..bf00f4fb 100644
--- a/src/location/maps/tiled/qgeotiledmaprequest.h
+++ b/src/location/maps/tiled/qgeotiledmaprequest.h
@@ -47,7 +47,7 @@
 #include <QRect>
 #include <QExplicitlySharedDataPointer>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoTiledMapData;
 class QGeoTiledMapRequestPrivate;
@@ -85,6 +85,6 @@ private:
 
 Q_LOCATION_EXPORT uint qHash(const QGeoTiledMapRequest &key);
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/tiled/qgeotiledmaprequest_p.h b/src/location/maps/tiled/qgeotiledmaprequest_p.h
index 4f379ff6..5c0a474a 100644
--- a/src/location/maps/tiled/qgeotiledmaprequest_p.h
+++ b/src/location/maps/tiled/qgeotiledmaprequest_p.h
@@ -57,7 +57,7 @@
 
 #include <QSharedData>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 //class QGeoTiledMapData;
 
@@ -79,6 +79,6 @@ public:
     QRect tileRect;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp
index 3a663dbe..e6ae4553 100644
--- a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp
@@ -50,7 +50,7 @@
 
 #include <QPointF>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapRouteObjectInfo::QGeoTiledMapRouteObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoTiledMapObjectInfo(mapData, mapObject)
@@ -140,5 +140,5 @@ void QGeoTiledMapRouteObjectInfo::regenPath()
 
 #include "moc_qgeotiledmaprouteobjectinfo_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h
index 49cada24..e275ab56 100644
--- a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h
+++ b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h
@@ -59,10 +59,8 @@
 
 #include <QPen>
 
+QT_BEGIN_NAMESPACE
 class QGraphicsPathItem;
-
-QTM_BEGIN_NAMESPACE
-
 class QGeoMapRouteObject;
 
 class QGeoTiledMapRouteObjectInfo : public QGeoTiledMapObjectInfo
@@ -84,7 +82,7 @@ private:
     void regenPath();
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //QGEOTILEDMAPROUTEOBJECT_INFO_P_H
 
diff --git a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp
index a51f9127..576eff82 100644
--- a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp
@@ -48,7 +48,7 @@
 
 #include <QFontMetrics>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapTextObjectInfo::QGeoTiledMapTextObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoTiledMapObjectInfo(mapData, mapObject)
@@ -165,5 +165,5 @@ void QGeoTiledMapTextObjectInfo::doAlignment()
 
 #include "moc_qgeotiledmaptextobjectinfo_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h
index e11aa73a..7e4ce9f8 100644
--- a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h
+++ b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h
@@ -60,9 +60,9 @@
 #include <QPen>
 #include <QBrush>
 
-class QGraphicsSimpleTextItem;
+QT_BEGIN_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+class QGraphicsSimpleTextItem;
 
 class QGeoMapTextObject;
 
@@ -88,7 +88,7 @@ private:
     void doAlignment();
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif //QGEOTILEDMAPTEXTOBJECT_INFO_P_H