Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: fix Mac framework build remove compiler warnings caused by ASCII conversions Fix copy2build output path for QML plugin. MOBILITY-2975: draft version MOBILITY-2891: route dialog, map component remove old Maemo5 code make QtLocation work while Qt is compiled with namespace
author: Qt Continuous Integration System <qt-info@nokia.com> 2011-06-28 17:49:41 +1000
committer: Qt Continuous Integration System <qt-info@nokia.com> 2011-06-28 17:49:41 +1000
commit: 8acf30adfa51aba4ee0f2fdd71c9c50e9c759a23 (patch)
tree: a853895bea338b3caf079fbbca6bdbad6e56a314
parent: 9ea12ecb8e008e176867df6f0f0e24b0af802959 (diff)
parent: 35721609275e38c1d35203cd2c5ee5c2a07f9763 (diff)
390 files changed, 2265 insertions, 1718 deletions
diff --git a/examples/declarative/mapviewer/Dialog.qml b/examples/declarative/mapviewer/Dialog.qml
index 504ca1d9..2bee59e6 100644
--- a/examples/declarative/mapviewer/Dialog.qml
+++ b/examples/declarative/mapviewer/Dialog.qml
@@ -52,14 +52,16 @@ Item {
     property alias dialogModel: dialogModel
     property alias length: dialogModel.count
     property int gap: 20
-    property int listItemHeight: 54
+    property int listItemHeight: 30
+
+    opacity: 0
 
     function setModel(objects)
     {
         dialogModel.clear()
 
         for (var i=0; i< objects.length; i++){
-            dialogModel.append({"label": objects[i][0], "inputText": objects[i][1]})
+            dialogModel.append({"labelText": objects[i][0], "inputText": objects[i][1]})
         }
     }
 
@@ -69,7 +71,7 @@ Item {
         id: dialogRectangle
 
         color: "lightsteelblue"
-        opacity: 1
+        opacity: parent.opacity
         width: parent.width - gap;
         height: listview.height + titleBar.height + buttonGo.height + gap*2
 
@@ -101,43 +103,21 @@ Item {
             Column {
                 id: column1
                 height: listItemHeight
-                Text { id: fieldTitle; text: label; height: 24;}
-                Rectangle {
-                    id: inputRectangle
-                    width: dialogRectangle.width - gap; height: 30
-                    color: "whitesmoke"
-                    border.width: 1
-                    radius: 5
-                    TextInput {
-                        id: inputField
-                        focus: true
-                        width: parent.width - anchors.leftMargin
-
-                        anchors {
-                            left: parent.left;
-                            verticalCenter: parent.verticalCenter;
-                            leftMargin: 5
-                        }
-
-                        Component.onCompleted: {
-                            text = inputText
-                        }
-
-                        onTextChanged:
-                        {
-                            dialogModel.set(index, {"inputText": text})
-                        }
-                    }
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: inputField.forceActiveFocus();
+                TextWithLabel {
+                    id: textWithLabel
+                    label: labelText
+                    text: inputText
+                    width: dialogRectangle.width - gap
+                    labelWidth: 75
+
+                    onTextChanged:
+                    {
+                        dialogModel.set(index, {"inputText": text})
                     }
                 }
             }
         }
 
-
-
         ListView {
             id: listview
             anchors {
@@ -148,10 +128,10 @@ Item {
             }
             model: dialogModel
             delegate: listDelegate
-            spacing: gap
+            spacing: gap/2
             interactive: false
             Component.onCompleted: {
-                height = (listItemHeight + gap)*length
+                height = (listItemHeight + gap/2)*length + gap/2
             }
         }
 
@@ -167,4 +147,3 @@ Item {
         }
     }
 }
-
diff --git a/examples/declarative/mapviewer/MapComponent.qml b/examples/declarative/mapviewer/MapComponent.qml
new file mode 100644
index 00000000..2751fbfc
--- /dev/null
+++ b/examples/declarative/mapviewer/MapComponent.qml
@@ -0,0 +1,260 @@
+/****************************************************************************
+**
+** 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 examples of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+import Qt.location 5.0
+import "common" as Common
+
+Map {
+    id: map
+    plugin : defaultPlugin
+    zoomLevel: 9
+    focus: true
+    width: parent.width
+    center: defaultCoordinates
+    property int longPressDuration: 1000
+
+    property RouteQuery routeQuery: RouteQuery {}
+    property RouteModel routeModel: RouteModel {
+                                        plugin : map.plugin;
+                                        query: routeQuery
+                                        onStatusChanged:{
+                                            if (status == RouteModel.Ready){
+                                                if (count == 1) showRouteInfo()
+                                            }
+                                        }
+                                    }
+    property GeocodeModel geocodeModel: GeocodeModel {
+                                            plugin : map.plugin;
+                                            onStatusChanged:{
+                                                if ((status == GeocodeModel.Ready) || (status == GeocodeModel.Error)) map.geocodeFinished()
+                                            }
+                                        }
+
+    signal mousePressed() // replace with
+                          // signal mousePressed(MouseEvent mouse)
+                          // when QTBUG-14550 is fixed
+    signal sliderUpdated()
+    signal coordinatesCaptured(double latitude, double longitude)
+    signal showRouteInfo()
+    signal geocodeFinished()
+    signal showGeocodeInfo()
+
+    Component {
+        id: routeDelegate
+        MapRoute {
+            route: path
+            color: routeMouseArea.containsMouse ? "lime" :"red"
+            MapMouseArea {
+                id: routeMouseArea
+                hoverEnabled: true
+                onPressed : {routeTimer.start()}
+                onReleased : { if (routeTimer.running) routeTimer.stop() }//SHORT PRESS
+                onPositionChanged: { if (routeTimer.running) routeTimer.stop()}
+
+                Timer {
+                    id: routeTimer
+                    interval: longPressDuration; running: false; repeat: false
+                    onTriggered: { //LONG PRESS
+                        map.showRouteInfo()
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: pointDelegate
+        MapCircle {
+            radius: 1000
+            color: circleMouseArea.containsMouse ? "lime" : "#80FF0000"
+            center: place.coordinate
+            MapMouseArea {
+                id: circleMouseArea
+                hoverEnabled: true
+                onPressed : { circleTimer.start()}
+                onReleased : { if (circleTimer.running) circleTimer.stop() }//SHORT PRESS
+                onPositionChanged: {
+                    if (circleTimer.running) circleTimer.stop()
+                    if (mouse.button == Qt.LeftButton) radius = center.distanceTo(mouse.coordinate)
+                }
+
+                Timer {
+                    id: circleTimer
+                    interval: longPressDuration; running: false; repeat: false
+                    onTriggered: { //LONG PRESS
+                        map.geocodeFinished()
+                    }
+                }
+            }
+        }
+    }
+
+    MapObjectView {
+        model: routeModel
+        delegate: routeDelegate
+    }
+
+    MapObjectView {
+        model: geocodeModel
+        delegate: pointDelegate
+    }
+
+    Plugin {
+        id: defaultPlugin
+        name : "nokia"
+    }
+
+    Coordinate {
+        id: defaultCoordinates
+        latitude : -27.575
+        longitude : 153.088
+    }
+
+    Common.Slider {
+        id: zoomSlider;
+        parent: map.parent //todo: remove the line
+        minimum: map.minimumZoomLevel;
+        maximum: map.maximumZoomLevel;
+        opacity: 1
+        z: map.z + 1
+        anchors {
+            bottom: parent.bottom;
+            bottomMargin: 50; rightMargin: 5; leftMargin: 5
+            left: parent.left
+        }
+        width: parent.width - anchors.rightMargin - anchors.leftMargin
+        value: map.zoomLevel
+        onValueChanged: {
+            map.zoomLevel = value
+            map.sliderUpdated()
+        }
+    }
+
+    Common.Menu {
+        id: popupMenu
+        orientation: ListView.Vertical
+        z: map.z + 1
+        opacity: 0
+
+        itemHeight: 30;
+        itemWidth: 150
+        x: 0
+        y: 0
+
+        Component.onCompleted: {
+            setModel(["Capture"])
+        }
+        onClicked: {
+            map.coordinatesCaptured(mouseArea.lastCoordinate.latitude, mouseArea.lastCoordinate.longitude)
+            map.state = ""
+        }
+    }
+
+    MapMouseArea {
+        id: mouseArea
+        property int lastX : -1
+        property int lastY : -1
+        property Coordinate lastCoordinate: Coordinate { latitude : 0; longitude : 0}
+
+        onPressed : {
+            mapTimer.start()
+            map.state = ""
+            lastX = mouse.x
+            lastY = mouse.y
+            lastCoordinate = mouse.coordinate
+            map.mousePressed()
+        }
+        onReleased : {
+            if (mapTimer.running) { //SHORT PRESS
+                mapTimer.stop()
+                lastX = -1
+                lastY = -1
+            }
+        }
+        onPositionChanged: {
+            if (mapTimer.running) mapTimer.stop()
+            if ((mouse.button == Qt.LeftButton) & (map.state == "")) {
+                if ((lastX != -1) && (lastY != -1)) {
+                    var dx = mouse.x - lastX
+                    var dy = mouse.y - lastY
+                    map.pan(-dx, -dy)
+                }
+                lastX = mouse.x
+                lastY = mouse.y
+            }
+        }
+        onDoubleClicked: {
+            map.center = mouse.coordinate
+            if (mouse.button == Qt.LeftButton){
+                map.zoomLevel += 1
+            } else if (mouse.button == Qt.RightButton){
+                map.zoomLevel -= 1
+            }
+            lastX = -1
+            lastY = -1
+        }
+        Timer {
+            id: mapTimer
+            interval: longPressDuration; running: false; repeat: false
+            onTriggered: { //LONG PRESS
+                map.state = "PopupMenu"
+            }
+        }
+    }
+
+    Keys.onPressed: {
+        if ((event.key == Qt.Key_Plus) || (event.key == Qt.Key_VolumeUp)) {
+            map.zoomLevel += 1
+        } else if ((event.key == Qt.Key_Minus) || (event.key == Qt.Key_VolumeDown)){
+            map.zoomLevel -= 1
+        }
+    }
+
+    // states of map
+    states: [
+        State {
+            name: "PopupMenu"
+            PropertyChanges { target: popupMenu; opacity: 1}
+            PropertyChanges { target: popupMenu; x: ((mouseArea.lastX + popupMenu.width > map.width) ? map.width - popupMenu.width : mouseArea.lastX)}
+            PropertyChanges { target: popupMenu; y: ((mouseArea.lastY + popupMenu.height > map.height) ? map.height - popupMenu.height : mouseArea.lastY)}
+        }
+    ]
+}
diff --git a/examples/declarative/mapviewer/Message.qml b/examples/declarative/mapviewer/Message.qml
index eafa5f1b..c5531cba 100644
--- a/examples/declarative/mapviewer/Message.qml
+++ b/examples/declarative/mapviewer/Message.qml
@@ -52,6 +52,7 @@ Item {
 
     signal okButtonClicked
     signal cancelButtonClicked
+    opacity: 0
 
     Common.Fader {}
 
@@ -59,10 +60,8 @@ Item {
         id: dialogRectangle
 
         color: "lightsteelblue"
-        opacity: 1
         width: parent.width - gap;
         height: titleBar.height + message.height + okButton.height + gap*3
-
         anchors {
             top: parent.top
             topMargin: 50
@@ -90,7 +89,7 @@ Item {
             width: dialogRectangle.width - gap
             anchors.topMargin: gap
             textFormat: Text.RichText
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.Wrap
             onLinkActivated: {
                 Qt.openUrlExternally(link)
             }
@@ -109,4 +108,3 @@ Item {
         }
     }
 }
-
diff --git a/examples/declarative/mapviewer/RouteDialog.qml b/examples/declarative/mapviewer/RouteDialog.qml
new file mode 100644
index 00000000..a8cdf3b5
--- /dev/null
+++ b/examples/declarative/mapviewer/RouteDialog.qml
@@ -0,0 +1,381 @@
+/****************************************************************************
+**
+** 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 examples of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+import Qt.location 5.0
+import "common" as Common
+
+Item {
+    id: dialog
+    signal goButtonClicked
+    signal cancelButtonClicked
+
+    anchors.fill: parent
+    property int gap: 10
+    opacity: 0
+
+    property alias title: titleBar.text
+    property alias startLatitude: latFrom.text
+    property alias startLongitude: longFrom.text
+    property alias endLatitude: latTo.text
+    property alias endLongitude: longTo.text
+    property alias startStreet: streetFrom.text
+    property alias startCity: cityFrom.text
+    property alias startCountry: countryFrom.text
+    property alias endStreet: streetTo.text
+    property alias endCity: cityTo.text
+    property alias endCountry: countryTo.text
+    property alias byCoordinates: coord.enabled
+    property int travelMode: RouteQuery.CarTravel             // CarTravel, PedestrianTravel, BicycleTravel, PublicTransitTravel, TruckTravel
+    property int routeOptimization: RouteQuery.ShortestRoute  // ShortestRoute, FastestRoute, MostEconomicRoute, MostScenicRoute
+                                                              // TODO NoFeature, TollFeature, HighwayFeature, PublicTransitFeature, FerryFeature, TunnelFeature, DirtRoadFeature, ParksFeature, MotorPoolLaneFeature
+
+    Common.Fader {}
+
+    Rectangle {
+        id: dialogRectangle
+        color: "lightsteelblue"
+        opacity: 1
+        width: parent.width - gap*2;
+        height: options.height + gap*3 + buttonGo.height + titleBar.height
+
+        anchors {
+            top: parent.top
+            topMargin: 50
+            left: parent.left
+            leftMargin: gap
+        }
+
+        border.width: 1
+        border.color: "darkblue"
+        radius: 5
+
+        Common.TitleBar {
+            id: titleBar;
+            width: parent.width; height: 40;
+            anchors.top: parent.top; anchors.left: parent.left;
+            opacity: 0.9
+            text: "Route"
+            onClicked: { dialog.cancelButtonClicked() }
+        }
+
+        Column {
+           id: options
+           spacing: gap
+           width: dialogRectangle.width - gap*2
+
+           anchors {
+               top: titleBar.bottom
+               topMargin: gap
+               left: dialogRectangle.left
+               leftMargin: gap
+           }
+
+            states: [
+                State {
+                    name: "Address"
+                    PropertyChanges { target: coord; enabled: false }
+                    PropertyChanges { target: address; enabled: true }
+                }
+            ]
+
+
+//by coordinates
+            Row {
+                id: row1
+                spacing: gap
+                Image {
+                    id: optionButtonCoord
+                    anchors.verticalCenter:parent.verticalCenter
+                    source: coord.enabled ? "resources/option_button_selected.png" : "resources/option_button.png"
+                    MouseArea {
+                        anchors.fill: parent
+                        onClicked: { options.state = "" }
+                    }
+                }
+
+                Rectangle {
+                    id: coord
+                    color: dialogRectangle.color
+                    border.width: 1
+                    border.color: enabled ? "black" : "grey"
+                    radius: 5
+                    width:options.width - optionButtonCoord.width - row1.spacing
+                    height: longTo.y + longTo.height + gap
+                    enabled: true
+
+//start point
+                    Text {
+                        id: fromLabel;
+                        font.bold: true;
+                        enabled: coord.enabled
+                        anchors {
+                            top: latFrom.top
+                            topMargin:latFrom.height + gap/6 - fromLabel.height/2
+                            left: parent.left;
+                            leftMargin: gap
+                        }
+                        text: "From"
+                        color: enabled ? "black" : "grey"
+                    }
+
+                    TextWithLabel {
+                        id: latFrom
+                        width: parent.width - fromLabel.width - gap*3
+                        text: "-27.575"
+                        label: "latitude"
+                        enabled: coord.enabled
+                        anchors {
+                            left: fromLabel.right
+                            leftMargin: gap
+                            top: parent.top
+                            topMargin:gap
+                        }
+                    }
+
+                    TextWithLabel {
+                        id: longFrom
+                        width: latFrom.width
+                        text: "153.088"
+                        label: "longitude"
+                        enabled: coord.enabled
+                        anchors {
+                            left: latFrom.left
+                            top: latFrom.bottom
+                            topMargin:gap/3
+                        }
+                    }
+
+//end point
+                    Text {
+                        id: toLabel;
+                        font.bold: true;
+                        width: fromLabel.width
+                        enabled: coord.enabled
+                        anchors {
+                            top: latTo.top
+                            topMargin:latTo.height + gap/6 - toLabel.height/2
+                            left: parent.left;
+                            leftMargin: gap;
+                        }
+                        text: "To"
+                        color: enabled ? "black" : "grey"
+                    }
+
+                    TextWithLabel {
+                        id: latTo
+                        width: latFrom.width
+                        text: "-27.465"
+                        label: "latitude"
+                        enabled: coord.enabled
+                        anchors {
+                            left: toLabel.right
+                            leftMargin: gap
+                            top: longFrom.bottom
+                            topMargin:gap
+                        }
+                    }
+
+                    TextWithLabel {
+                        id: longTo
+                        width: latTo.width
+                        text: "153.023"
+                        label: "longitude"
+                        enabled: coord.enabled
+                        anchors {
+                            left: latTo.left
+                            top: latTo.bottom
+                            topMargin:gap/3
+                        }
+                    }
+                }
+            }
+
+//by address
+            Row {
+                id: row2
+                spacing: gap
+
+                Image {
+                    id: optionButtonAddress
+                    source: address.enabled ? "resources/option_button_selected.png" : "resources/option_button.png"
+                    anchors.verticalCenter: parent.verticalCenter
+                    MouseArea {
+                        anchors.fill: parent
+                        onClicked: { options.state = "Address" }
+                    }
+                }
+
+                Rectangle {
+                    id: address
+                    color: dialogRectangle.color
+                    border.width: 1
+                    border.color: enabled ? "black" : "grey"
+                    radius: 5
+                    width:coord.width
+                    height: countryTo.y + countryTo.height + gap
+                    enabled: false
+
+//start point
+                    Text {
+                        id: fromLabel2;
+                        font.bold: true;
+                        enabled: address.enabled
+                        anchors {
+                            top: cityFrom.top
+                            left: parent.left;
+                            leftMargin: gap
+                        }
+                        text: "From"
+                        color: enabled ? "black" : "grey"
+                    }
+
+                    TextWithLabel {
+                        id: streetFrom
+                        width: parent.width - fromLabel2.width - gap*3
+                        text: "Brandl st"
+                        label: "street"
+                        enabled: address.enabled
+                        anchors {
+                            left: fromLabel2.right
+                            leftMargin: gap
+                            top: parent.top
+                            topMargin:gap
+                        }
+                    }
+
+                    TextWithLabel {
+                        id: cityFrom
+                        width: streetFrom.width
+                        text: "Eight Mile Plains"
+                        label: "city"
+                        enabled: address.enabled
+                        anchors {
+                            left: streetFrom.left
+                            top: streetFrom.bottom
+                            topMargin:gap/3
+                        }
+                    }
+
+                    TextWithLabel {
+                        id: countryFrom
+                        width: streetFrom.width
+                        text: "Australia"
+                        label: "country"
+                        enabled: address.enabled
+                        anchors {
+                            left: streetFrom.left
+                            top: cityFrom.bottom
+                            topMargin:gap/3
+                        }
+                    }
+
+
+//end point
+                    Text {
+                        id: toLabel2;
+                        font.bold: true;
+                        enabled: address.enabled
+                        anchors {
+                            top: cityTo.top
+                            left: parent.left;
+                            leftMargin: gap
+                        }
+                        text: "To"
+                        color: enabled ? "black" : "grey"
+                    }
+
+                    TextWithLabel {
+                        id: streetTo
+                        width: parent.width - fromLabel2.width - gap*3
+                        text: "Ann st"
+                        label: "street"
+                        enabled: address.enabled
+                        anchors {
+                            left: fromLabel2.right
+                            leftMargin: gap
+                            top: countryFrom.bottom
+                            topMargin:gap
+                        }
+                    }
+
+                    TextWithLabel {
+                        id: cityTo
+                        width: streetTo.width
+                        text: "Brisbane"
+                        label: "city"
+                        enabled: address.enabled
+                        anchors {
+                            left: streetTo.left
+                            top: streetTo.bottom
+                            topMargin:gap/3
+                        }
+                    }
+
+                    TextWithLabel {
+                        id: countryTo
+                        width: streetTo.width
+                        text: "Australia"
+                        label: "country"
+                        enabled: address.enabled
+                        anchors {
+                            left: streetTo.left
+                            top: cityTo.bottom
+                            topMargin:gap/3
+                        }
+                    }
+
+                }
+            }
+        }
+
+        Common.Button {
+            id: buttonGo
+            text: "Go!"
+            anchors.top: options.bottom
+            anchors.topMargin: gap
+            width: 80; height: 32
+            anchors.horizontalCenter: parent.horizontalCenter
+            onClicked: {
+                dialog.goButtonClicked ()
+            }
+        }
+    }
+}
diff --git a/examples/declarative/mapviewer/TextWithLabel.qml b/examples/declarative/mapviewer/TextWithLabel.qml
new file mode 100644
index 00000000..40242bb4
--- /dev/null
+++ b/examples/declarative/mapviewer/TextWithLabel.qml
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** 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 examples of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Row {
+    id: textWithLabel
+    height: inputRectangle.height
+
+    property alias label: label.text
+    property alias text: inputField.text
+    property alias labelWidth: label.width
+
+    Text {
+        id: label;
+        width:55;
+        enabled: textWithLabel.enabled
+        color: enabled ? "black" : "grey"
+        anchors {
+            top: parent.top;
+            topMargin: (inputRectangle.height-height)/2
+        }
+    }
+
+    Rectangle {
+        id: inputRectangle
+        width: textWithLabel.width - label.width; height: 30
+        color: enabled ? "whitesmoke" : "gainsboro"
+        border.width: 1
+        border.color: enabled ? "black" : "grey"
+        radius: 5
+        TextInput {
+            id: inputField
+            focus: true
+            width: parent.width - anchors.leftMargin
+            enabled: textWithLabel.enabled
+            color: enabled ? "black" : "grey"
+            horizontalAlignment: Text.AlignLeft
+
+            anchors {
+                left: parent.left;
+                verticalCenter: parent.verticalCenter;
+                leftMargin: 5
+            }
+        }
+    }
+}
diff --git a/examples/declarative/mapviewer/common/Button.qml b/examples/declarative/mapviewer/common/Button.qml
index dc643d53..529ef147 100755
--- a/examples/declarative/mapviewer/common/Button.qml
+++ b/examples/declarative/mapviewer/common/Button.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/examples/declarative/mapviewer/common/Fader.qml b/examples/declarative/mapviewer/common/Fader.qml
index e94b30ba..c6a064fd 100644
--- a/examples/declarative/mapviewer/common/Fader.qml
+++ b/examples/declarative/mapviewer/common/Fader.qml
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** 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 examples of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 import Qt 4.7
 
 Rectangle {
@@ -8,6 +48,7 @@ Rectangle {
     MouseArea {
         id: mouseArea
         anchors.fill: parent
+        hoverEnabled: true
     }
 
     Component.onCompleted: {
diff --git a/examples/declarative/mapviewer/common/Menu.qml b/examples/declarative/mapviewer/common/Menu.qml
index 221765f6..05dc17e4 100644
--- a/examples/declarative/mapviewer/common/Menu.qml
+++ b/examples/declarative/mapviewer/common/Menu.qml
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** 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 examples of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 import Qt 4.7
 
 Item {
@@ -11,6 +51,8 @@ Item {
     height: (menuView.orientation == ListView.Horizontal)? itemHeight : itemHeight * count
     width: (menuView.orientation == ListView.Horizontal)? itemWidth * count : itemWidth
     property bool keepPreviousValue: false
+    property string nestedMenuSign: "\u25c2"
+    property string nestedPressedMenuSign: "\u25c0"
 
     signal clicked
 
@@ -90,6 +132,26 @@ Item {
                     name: "Hovered"
                     when: mouseRegion.containsMouse == true
                     PropertyChanges { target: menuItemImage; source: "../resources/menuItem_hovered.png"}
+                    StateChangeScript {
+                        name: "myScript"
+                        script:{
+                            var str = menuItemText.text
+                            if (str.charAt(0) == menu.nestedMenuSign ) menuItemText.text = menu.nestedPressedMenuSign + str.substring(1, str.length)
+                            else if (str.charAt(str.length -1) == menu.nestedMenuSign ) menuItemText.text = str.substring(0, str.length-1) + menu.nestedPressedMenuSign
+                        }
+                    }
+                },
+                State {
+                    name: "Released"
+                    when: mouseRegion.containsMouse == false
+                    StateChangeScript {
+                        name: "myScript"
+                        script:{
+                            var str = menuItemText.text
+                            if (str.charAt(0) == menu.nestedPressedMenuSign ) menuItemText.text = menu.nestedMenuSign + str.substring(1, str.length)
+                            else if (str.charAt(str.length-1) == menu.nestedPressedMenuSign ) menuItemText.text = str.substring(0, str.length-1) + menu.nestedMenuSign
+                        }
+                    }
                 },
                 State {
                     name: "Disabled"
diff --git a/examples/declarative/mapviewer/common/Slider.qml b/examples/declarative/mapviewer/common/Slider.qml
index 129df855..2b7aeb5b 100644
--- a/examples/declarative/mapviewer/common/Slider.qml
+++ b/examples/declarative/mapviewer/common/Slider.qml
@@ -1,6 +1,6 @@
-/*/****************************************************************************
+/****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -43,8 +43,7 @@ import Qt 4.7
 Item {
     id: slider;
     height: 40
-    // value is read/write.
-    property int value
+    property int value // value is read/write.
     property real minimum: 0
     property real maximum: 1
     property int xMin: 2
diff --git a/examples/declarative/mapviewer/common/TitleBar.qml b/examples/declarative/mapviewer/common/TitleBar.qml
index ed175f50..fcb58903 100755
--- a/examples/declarative/mapviewer/common/TitleBar.qml
+++ b/examples/declarative/mapviewer/common/TitleBar.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/examples/declarative/mapviewer/mapviewer.qml b/examples/declarative/mapviewer/mapviewer.qml
index 6e0cfa91..116f5ef7 100644
--- a/examples/declarative/mapviewer/mapviewer.qml
+++ b/examples/declarative/mapviewer/mapviewer.qml
@@ -45,8 +45,10 @@ import "common" as Common
 FocusScope {
     anchors.fill: parent
     id: page
+    focus: true
 
     Rectangle {
+        id: backgroundRect
         anchors.fill: parent
         color: "darkgrey"
         z:2
@@ -54,36 +56,18 @@ FocusScope {
 
 
     Common.TitleBar {
-        id: titleBar; z: 4; width: parent.width; height: 40; opacity: 0.9; text: "QML mapviewer example"
+        id: titleBar; z: mainMenu.z; width: parent.width; height: 40; opacity: 0.9; text: "QML mapviewer example"
         onClicked: { Qt.quit() }
     }
 
-    Common.Slider {
-        id: zoomSlider;
-        minimum: map.minimumZoomLevel;
-        maximum: map.maximumZoomLevel;
-        opacity: 1
-        z: 4
-        anchors {
-            bottom: mainMenu.top;
-            bottomMargin: 5; rightMargin: 5; leftMargin: 5
-            left: parent.left
-        }
-        width: parent.width - anchors.rightMargin - anchors.leftMargin
-        value: map.zoomLevel
-        onValueChanged: {
-            map.zoomLevel = value
-        }
-    }
-
-    // Menus
+//=====================Menus=====================
     Common.Menu {
         id: mainMenu
         itemHeight: 40
         itemWidth: page.width / count
         anchors.bottom: parent.bottom
         orientation: ListView.Horizontal
-        z: 5
+        z: map.z + 3
         Component.onCompleted: {
             setModel(["Options","Settings"])
         }
@@ -141,7 +125,7 @@ FocusScope {
         orientation: ListView.Vertical
         z: mainMenu.z - 1
         Component.onCompleted: {
-            setModel(["Map type", "Connectivity", "Provider"])
+            setModel([ settingsMenu.nestedMenuSign + " Map type", settingsMenu.nestedMenuSign + " Connectivity", "  Provider"])
         }
 
         itemHeight: 30;
@@ -160,7 +144,8 @@ FocusScope {
                     break;
                 }
                 case 2: {
-                    page.state = "ProviderInfo"
+                    messageDialog.state = "Provider"
+                    page.state = "Message"
                     break;
                 }
             }
@@ -253,54 +238,167 @@ FocusScope {
     }
 
 
-    // Dialogs
-
+//=====================Dialogs=====================
     Message {
-        id: providerInfoDialog
-        title: "Provider"
-        text: "Nokia OVI <a href=\http://doc.qt.nokia.com/qtmobility-1.2/location-overview.html#the-nokia-plugin\">map plugin</a>."
-        z: 5
-        opacity: 0
+        id: messageDialog
+        z: mainMenu.z + 1
         onOkButtonClicked: {
             page.state = ""
         }
         onCancelButtonClicked: {
             page.state = ""
         }
+
+        states: [
+            State{
+                name: "Provider"
+                PropertyChanges { target: messageDialog; title: "Provider" }
+                PropertyChanges { target: messageDialog; text: "Nokia OVI <a href=\http://doc.qt.nokia.com/qtmobility-1.2/location-overview.html#the-nokia-plugin\">map plugin</a>." }
+            },
+            State{
+                name: "GeocodeError"
+                PropertyChanges { target: messageDialog; title: "Geocode Error" }
+                PropertyChanges { target: messageDialog; text: "Unable to find location for the given address." }
+            },
+            State{
+                name: "UnknownGeocodeError"
+                PropertyChanges { target: messageDialog; title: "Geocode Error" }
+                PropertyChanges { target: messageDialog; text: "Unknown geocode error. Try again" }
+            },
+            State{
+                name: "AmbiguousGeocode"
+                PropertyChanges { target: messageDialog; title: "Ambiguous geocode" }
+                PropertyChanges { target: messageDialog; text: "Several results found for the given address, please specify location" }
+            },
+            State{
+                name: "Coordinates"
+                PropertyChanges { target: messageDialog; title: "Coordinates" }
+                PropertyChanges { target: messageDialog; text: "Several results found for the given address, please specify location" }
+            },
+            State{
+                name: "LatitudeNotANumber"
+                PropertyChanges { target: messageDialog; title: "Input Error" }
+                PropertyChanges { target: messageDialog; text: "Latitude is not a number" }
+            },
+            State{
+                name: "LatitudeOutOfScope"
+                PropertyChanges { target: messageDialog; title: "Input Error" }
+                PropertyChanges { target: messageDialog; text: "Latitude should be in a range (-90,90)" }
+            },
+            State{
+                name: "LongitudeNotANumber"
+                PropertyChanges { target: messageDialog; title: "Input Error" }
+                PropertyChanges { target: messageDialog; text: "Longitude is not a number" }
+            },
+            State{
+                name: "LongitudeOutOfScope"
+                PropertyChanges { target: messageDialog; title: "Input Error" }
+                PropertyChanges { target: messageDialog; text: "Longitude should be in a range (-180,180)" }
+            },
+            State{
+                name: "NoAddress"
+                PropertyChanges { target: messageDialog; title: "Address" }
+                PropertyChanges { target: messageDialog; text: "Current location doesn't have address" }
+            },
+            State{
+                name: "LocationInfo"
+                PropertyChanges { target: messageDialog; title: "Location" }
+                PropertyChanges { target: messageDialog; text: geocodeMessage() }
+            }
+        ]
     }
 
-    Dialog {
+//Route Dialog
+    RouteDialog {
         id: routeDialog
-        title: "Routing from map center to"
-        z: 5
-        opacity: 0
-
-        Component.onCompleted: {
-            var obj = [["latitude:", "51.2207"],["and longitude:", "0.1"]]
-            setModel(obj)
-        }
-        Coordinate {
-            id: endCoordinate
+        z: mainMenu.z + 1
+
+        Coordinate { id: endCoordinate }
+        Coordinate { id: startCoordinate }
+        Address { id:startAddress }
+        Address { id:endAddress }
+
+        GeocodeModel {
+            id: tempGeocodeModel
+            plugin : map.plugin
+            property int successfulGeocodeCount: 0
+            onStatusChanged:{
+                if ((status == GeocodeModel.Ready) && (successfulGeocodeCount == 0)) {
+                    ++successfulGeocodeCount
+                    startCoordinate = tempGeocodeModel.get(0).coordinate
+
+                    query = endAddress
+                    update();
+                }
+                else if ((status == GeocodeModel.Ready) && (successfulGeocodeCount == 1)) {
+                    ++successfulGeocodeCount
+                    endCoordinate = tempGeocodeModel.get(0).coordinate
+
+                    map.routeQuery.clearWaypoints();
+                    map.center = startCoordinate
+                    map.routeQuery.addWaypoint(startCoordinate)
+                    map.routeQuery.addWaypoint(endCoordinate)
+                    map.routeQuery.travelModes = routeDialog.travelMode
+                    map.routeQuery.routeOptimizations = routeDialog.routeOptimization
+                    map.routeModel.update();
+                }
+                else if ((status == GeocodeModel.Ready) && (count == 0 )){
+                    messageDialog.state = "GeocodeError"
+                    page.state = "Message"
+                }
+                else if ((status == GeocodeModel.Ready) && (count > 1 )){
+                    messageDialog.state = "AmbiguousGeocode"
+                    page.state = "Message"
+                }
+                else if (status == GeocodeModel.Error) {
+                    messageDialog.state = "UnknownGeocodeError"
+                    page.state = "Message"
+                }
+            }
         }
+
         onGoButtonClicked: {
+            var status = true
+
+            if (routeDialog.byCoordinates) {
+                startCoordinate.latitude = routeDialog.startLatitude
+                startCoordinate.longitude = routeDialog.startLongitude
+                endCoordinate.latitude = routeDialog.endLatitude
+                endCoordinate.longitude = routeDialog.endLongitude
+
+                map.routeQuery.clearWaypoints();
+                map.center = startCoordinate
+                map.routeQuery.addWaypoint(startCoordinate)
+                map.routeQuery.addWaypoint(endCoordinate)
+                map.routeQuery.travelModes = routeDialog.travelMode
+                map.routeQuery.routeOptimizations = routeDialog.routeOptimization
+                map.routeModel.update();
+            }
+            else {
+                startAddress.country = routeDialog.startCountry
+                startAddress.street = routeDialog.startStreet
+                startAddress.district = routeDialog.startCity
+
+                endAddress.country = routeDialog.endCountry
+                endAddress.street = routeDialog.endStreet
+                endAddress.district = routeDialog.endCity
+
+                tempGeocodeModel.query = startAddress
+                tempGeocodeModel.update();
+            }
             page.state = ""
-            endCoordinate.latitude = dialogModel.get(0).inputText
-            endCoordinate.longitude = dialogModel.get(1).inputText
-            routeQuery.clearWaypoints();
-            routeQuery.addWaypoint(map.center)    // Starting coordinate
-            routeQuery.addWaypoint(endCoordinate) // Ending coordinate
-            routeModel.update();
         }
+
         onCancelButtonClicked: {
             page.state = ""
         }
     }
 
+//Search Dialog
     Dialog {
         id: searchDialog
         title: "Search"
-        z: 5
-        opacity: 0
+        z: mainMenu.z + 1
 
         onGoButtonClicked: {
             page.state = ""
@@ -316,206 +414,211 @@ FocusScope {
         }
     }
 
+//Geocode Dialog
     Dialog {
         id: geocodeDialog
         title: "Geocode"
-        z: 5
-        opacity: 0
+        z: mainMenu.z + 1
 
         Component.onCompleted: {
-            var obj = [["Country:","Australia"],["Street:", "Brandl St 53"],["District:","Eight Mile Plains"]]
+            var obj = [["Street", "Brandl St"],["District",""],["City", "Eight Mile Plains"], ["County", ""],["State", ""],["Country code",""],["Country","Australia"]]
             setModel(obj)
         }
+
+        Address {
+            id: geocodeAddress
+        }
+
         onGoButtonClicked: {
             page.state = ""
-            geocodeAddress.country = dialogModel.get(0).inputText
-            geocodeAddress.street = dialogModel.get(1).inputText
-            geocodeAddress.district = dialogModel.get(2).inputText
-            geocodeModel.query = geocodeAddress
-            geocodeModel.update();
+            geocodeAddress.street = dialogModel.get(0).inputText
+            geocodeAddress.district = dialogModel.get(1).inputText
+            geocodeAddress.city = dialogModel.get(2).inputText
+            geocodeAddress.county = dialogModel.get(3).inputText
+            geocodeAddress.state = dialogModel.get(4).inputText
+            geocodeAddress.countryCode = dialogModel.get(5).inputText
+            geocodeAddress.country = dialogModel.get(6).inputText
+            map.geocodeModel.query = geocodeAddress
+            map.geocodeModel.update();
         }
         onCancelButtonClicked: {
             page.state = ""
         }
     }
 
+//Reverse Geocode Dialog
     Dialog {
         id: reverseGeocodeDialog
         title: "Reverse Geocode"
-        z: 5
-        opacity: 0
+        z: mainMenu.z + 1
 
         Component.onCompleted: {
-            var obj = [["Latitude:","51"],["Longitude:", "0"]]
+            var obj = [["Latitude","-27.575"],["Longitude", "153.088"]]
             setModel(obj)
         }
+
+        Coordinate {
+            id: reverseGeocodeCoordinate
+        }
+
         onGoButtonClicked: {
             page.state = ""
-            reverseGeocodeCoordinate.latitude = dialogModel.get(0).inputText
-            reverseGeocodeCoordinate.longitude = dialogModel.get(1).inputText
-            geocodeModel.query = reverseGeocodeCoordinate
-            geocodeModel.update();
+            messageDialog.state = ""
+            var latitude = dialogModel.get(0).inputText
+            var longtitude = dialogModel.get(1).inputText
+
+            verifyLatitude(latitude)
+            verifyLongitude(longtitude)
+
+            if (messageDialog.state == "") {
+                reverseGeocodeCoordinate.latitude = latitude
+                reverseGeocodeCoordinate.longitude = longtitude
+                map.geocodeModel.query = reverseGeocodeCoordinate
+                map.geocodeModel.update();
+            }
         }
+
         onCancelButtonClicked: {
             page.state = ""
         }
     }
-    RouteModel {
-        id : routeModel
-        plugin : Plugin { name : "nokia"}
-        query: RouteQuery {
-            id: routeQuery
+
+//=====================Map=====================
+    MapComponent{
+        id: map
+        z : backgroundRect.z + 1
+        size.width: parent.width
+        size.height: parent.height - mainMenu.height
+
+        onMousePressed: {
+            page.state = ""
         }
-    }
 
-    Address {
-        id: geocodeAddress
-    }
-    Coordinate {
-        id: reverseGeocodeCoordinate
-    }
-    GeocodeModel {
-        id: geocodeModel
-        plugin : Plugin { name : "nokia"}
-        onPlacesChanged: {
-            if (geocodeModel.count > 0) {
-                console.log('setting the coordinate as places changed in model.')
-                map.center = geocodeModel.get(0).coordinate
-            }
+        onSliderUpdated: {
+            page.state = ""
         }
-    }
 
-    Map {
-        id: map
-        z : 3
-        plugin : Plugin {name : "nokia"}
-        size.width: parent.width
-        size.height: parent.height
-        zoomLevel: 9
-        focus : true
-        center: Coordinate {
-            latitude: 51.5
-            longitude: -0.11
-        }
-
-        MapObjectView {
-            model: routeModel
-            delegate: Component {
-                MapRoute {
-                    // TODO this interface is bit unclear
-                    route: path
-                }
-            }
+        onCoordinatesCaptured: {
+            messageDialog.title = "Coordinates"
+            messageDialog.text = "<b>Latitude:</b> " + roundNumber(latitude,4) + "<br/><b>Longitude:</b> " + roundNumber(longitude,4);
+            page.state = "Message"
         }
 
-        MapObjectView {
-            model: geocodeModel
-            delegate: Component {
-                MapCircle {
-                    radius: 10000
-                    color: "red"
-                    center: place.coordinate
-                }
-            }
+        onShowRouteInfo: {
+            var value = map.routeModel.get(0).travelTime
+            var seconds = value % 60
+            value /= 60
+            value = Math.round(value)
+            var minutes = value % 60
+            value /= 60
+            value = Math.round(value)
+            var hours = value
+            var dist = roundNumber(map.routeModel.get(0).distance,0)
+
+            if (dist>1000) dist = dist/1000 + " km"
+            else dist = dist + " m"
+
+            messageDialog.title = "Route info"
+            messageDialog.text = "<b>Travel time:</b> " + hours + "h:"+ minutes + "m:" + seconds +"s<br/><b>Distance:</b> " + dist;
+
+            page.state = "Message"
         }
 
-        MapCircle {
-            id : circle
-            center : Coordinate {
-                        latitude : 51.5
-                        longitude : -0.11
-                    }
-            color : "#80FF0000"
-            radius : 1000.0
-            MapMouseArea {
-                onPositionChanged: {
-                    if (mouse.button == Qt.LeftButton)
-                        circle.center = mouse.coordinate
-                    if (mouse.button == Qt.RightButton)
-                        circle.radius = circle.center.distanceTo(mouse.coordinate)
-                }
-            }
+        onGeocodeFinished:{
+            var street, district, city, county, state, countryCode, country, latitude, longitude, text
+
+            if (map.geocodeModel.count == 0) messageDialog.state = "GeocodeError"
+            else if (map.geocodeModel.count > 1) messageDialog.state = "AmbiguousGeocode"
+            else if (map.status == GeocodeModel.Error) messageDialog.state = "UnknownGeocodeError"
+            else messageDialog.state = "LocationInfo"
+            page.state = "Message"
         }
 
-        MapMouseArea {
-            property int lastX : -1
-            property int lastY : -1
+        onShowGeocodeInfo:{
+            messageDialog.state = "LocationInfo"
+            page.state = "Message"
+        }
+    }
 
-            onPressed : {
-                if (page.state != "") page.state =""
-                else {
-                    lastX = mouse.x
-                    lastY = mouse.y
-                }
-            }
-            onReleased : {
-                lastX = -1
-                lastY = -1
-            }
-            onPositionChanged: {
-                if (mouse.button == Qt.LeftButton) {
-                    if ((lastX != -1) && (lastY != -1)) {
-                        var dx = mouse.x - lastX
-                        var dy = mouse.y - lastY
-                        map.pan(-dx, -dy)
-                    }
-                    lastX = mouse.x
-                    lastY = mouse.y
-                }
-            }
-            onDoubleClicked: {
-                map.center = mouse.coordinate
-                if (mouse.button == Qt.LeftButton){
-                    map.zoomLevel += 1
-                } else if (mouse.button == Qt.RightButton){
-                    map.zoomLevel -= 1
-                }
-                lastX = -1
-                lastY = -1
+    function geocodeMessage(){
+        var street, district, city, county, state, countryCode, country, latitude, longitude, text
+        map.center = map.geocodeModel.get(0).coordinate
+        latitude = map.geocodeModel.get(0).coordinate.latitude
+        longitude = map.geocodeModel.get(0).coordinate.longitude
+        street = map.geocodeModel.get(0).address.street
+        district = map.geocodeModel.get(0).address.district
+        city = map.geocodeModel.get(0).address.city
+        county = map.geocodeModel.get(0).address.county
+        state = map.geocodeModel.get(0).address.state
+        countryCode = map.geocodeModel.get(0).address.countryCode
+        country = map.geocodeModel.get(0).address.country
+
+        text = "<b>Latitude:</b> " + latitude + "<br/>"
+        text +="<b>Longitude:</b> " + longitude + "<br/>" + "<br/>"
+        if (street) text +="<b>Street: </b>"+ street + " <br/>"
+        if (district) text +="<b>District: </b>"+ district +" <br/>"
+        if (city) text +="<b>City: </b>"+ city + " <br/>"
+        if (county) text +="<b>County: </b>"+ county + " <br/>"
+        if (state) text +="<b>State: </b>"+ state + " <br/>"
+        if (countryCode) text +="<b>Country code: </b>"+ countryCode + " <br/>"
+        if (country) text +="<b>Country: </b>"+ country + " <br/>"
+        return text
+    }
+
+
+    function roundNumber(number, digits) {
+            var multiple = Math.pow(10, digits);
+            var rndedNum = Math.round(number * multiple) / multiple;
+            return rndedNum;
+    }
+
+    function verifyLongitude(longitude){
+        var lng
+        if (isNaN(longitude)) messageDialog.state = "LongitudeNotANumber"
+        else {
+            lng = parseFloat(longitude)
+            if ((lng> 180) || (lng<-180)) {
+                messageDialog.state = "LongitudeOutOfScope"
             }
         }
-    } // Map
-
-    Keys.onPressed: {
-        if ((event.key == Qt.Key_Plus) || (event.key == Qt.Key_VolumeUp)) {
-            map.zoomLevel += 1
-        } else if ((event.key == Qt.Key_Minus) || (event.key == Qt.Key_VolumeDown)){
-            map.zoomLevel -= 1
-        } else if (event.key == Qt.Key_T) {
-            if (map.mapType == Map.StreetMap) {
-                map.mapType = Map.SatelliteMapDay
-            } else if (map.mapType == Map.SatelliteMapDay) {
-                map.mapType = Map.StreetMap
+    }
+
+    function verifyLatitude(latitude){
+        var lat
+        if (isNaN(latitude)) messageDialog.state = "LatitudeNotANumber"
+        else {
+            lat = parseFloat(latitude)
+            if ((lat> 90) || (lat<-90)) {
+                messageDialog.state = "LatitudeOutOfScope"
             }
         }
     }
 
-    // states of page
+//=====================States of page=====================
     states: [
+       State {
+            name: ""
+            PropertyChanges { target: map; focus: true }
+        },
         State {
             name: "RevGeocode"
             PropertyChanges { target: reverseGeocodeDialog; opacity: 1 }
-            PropertyChanges { target: titleBar; hoverEnabled: false }
         },
         State {
             name: "Route"
             PropertyChanges { target: routeDialog; opacity: 1 }
-            PropertyChanges { target: titleBar; hoverEnabled: false }
         },
         State {
             name: "Search"
             PropertyChanges { target: searchDialog; opacity: 1 }
-            PropertyChanges { target: titleBar; hoverEnabled: false }
         },
         State {
             name: "Geocode"
             PropertyChanges { target: geocodeDialog; opacity: 1 }
-            PropertyChanges { target: titleBar; hoverEnabled: false }
         },
         State {
-            name: "ProviderInfo"
-            PropertyChanges { target: providerInfoDialog; opacity: 1 }
-            PropertyChanges { target: titleBar; hoverEnabled: false }
+            name: "Message"
+            PropertyChanges { target: messageDialog; opacity: 1 }
         },
         State {
             name : "Options"
@@ -537,7 +640,7 @@ FocusScope {
         }
     ]
 
-    // state-transition animations for page
+//=====================State-transition animations for page=====================
     transitions: [
         Transition {
             to: "RevGeocode"
@@ -556,7 +659,11 @@ FocusScope {
             NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear }
         },
         Transition {
-            to: "ProviderInfo"
+            to: "Message"
+            NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear }
+        },
+        Transition {
+            to: ""
             NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear }
         },
         Transition {
diff --git a/examples/declarative/mapviewer/mapviewer.qrc b/examples/declarative/mapviewer/mapviewer.qrc
index 46180e54..d5aae792 100644
--- a/examples/declarative/mapviewer/mapviewer.qrc
+++ b/examples/declarative/mapviewer/mapviewer.qrc
@@ -21,5 +21,10 @@
         <file>resources/button_hovered.png</file>
         <file>Message.qml</file>
         <file>common/Fader.qml</file>
+        <file>RouteDialog.qml</file>
+        <file>TextWithLabel.qml</file>
+        <file>resources/option_button_selected.png</file>
+        <file>resources/option_button.png</file>
+        <file>MapComponent.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/declarative/mapviewer/qmlmapviewer.cpp b/examples/declarative/mapviewer/qmlmapviewer.cpp
index c4466df8..86b29f47 100644
--- a/examples/declarative/mapviewer/qmlmapviewer.cpp
+++ b/examples/declarative/mapviewer/qmlmapviewer.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/examples/declarative/mapviewer/resources/option_button.png b/examples/declarative/mapviewer/resources/option_button.png
new file mode 100755
index 00000000..cf8dcda7
--- /dev/null
+++ b/examples/declarative/mapviewer/resources/option_button.png
diff --git a/examples/declarative/mapviewer/resources/option_button_selected.png b/examples/declarative/mapviewer/resources/option_button_selected.png
new file mode 100755
index 00000000..a0c01cf7
--- /dev/null
+++ b/examples/declarative/mapviewer/resources/option_button_selected.png
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 8751e5df..89b8d085 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -78,7 +78,6 @@
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
-QTM_USE_NAMESPACE
 
 class QLocationDeclarativeModule: public QDeclarativeExtensionPlugin
 {
diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro
index 48c999b7..6d72bdf1 100644
--- a/src/imports/location/location.pro
+++ b/src/imports/location/location.pro
@@ -4,7 +4,7 @@ TARGETPATH = Qt/location
 # Compatibility demands old path too.
 #TARGETPATH = QtMobility/location
 
-include(../qimportbase.pri)
+include(qlocationimport.pri)
 
 QT += declarative network location
 
diff --git a/src/imports/location/qdeclarativecoordinate.cpp b/src/imports/location/qdeclarativecoordinate.cpp
index 31aec957..2a77d32b 100644
--- a/src/imports/location/qdeclarativecoordinate.cpp
+++ b/src/imports/location/qdeclarativecoordinate.cpp
@@ -43,7 +43,7 @@
 #include <qnumeric.h>
 #include "qdeclarative.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Coordinate
@@ -176,5 +176,5 @@ qreal QDeclarativeCoordinate::distanceTo(QObject* coordinate)
 
 #include "moc_qdeclarativecoordinate_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativecoordinate_p.h b/src/imports/location/qdeclarativecoordinate_p.h
index c1bf61d9..e1655086 100644
--- a/src/imports/location/qdeclarativecoordinate_p.h
+++ b/src/imports/location/qdeclarativecoordinate_p.h
@@ -47,7 +47,7 @@
 
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeCoordinate : public QObject
 {
@@ -85,8 +85,8 @@ private:
     QGeoCoordinate m_coordinate;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeCoordinate));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCoordinate));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeoaddress.cpp b/src/imports/location/qdeclarativegeoaddress.cpp
index 621a101c..ab15ea04 100644
--- a/src/imports/location/qdeclarativegeoaddress.cpp
+++ b/src/imports/location/qdeclarativegeoaddress.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativegeoaddress_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Address QDeclarativeGeoAddress
@@ -245,4 +245,4 @@ void QDeclarativeGeoAddress::setPostcode(const QString& postcode)
 
 #include "moc_qdeclarativegeoaddress_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeoaddress_p.h b/src/imports/location/qdeclarativegeoaddress_p.h
index b750fb3c..1be9fddd 100644
--- a/src/imports/location/qdeclarativegeoaddress_p.h
+++ b/src/imports/location/qdeclarativegeoaddress_p.h
@@ -46,7 +46,7 @@
 #include <QtCore>
 #include <QtDeclarative/qdeclarative.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoAddress : public QObject
 {
@@ -97,7 +97,7 @@ private:
     QGeoAddress m_address;
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoAddress));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoAddress));
 
 #endif // QDECLARATIVEGEOADDRESS_P_H
diff --git a/src/imports/location/qdeclarativegeoboundingbox.cpp b/src/imports/location/qdeclarativegeoboundingbox.cpp
index f454877d..aab4a78d 100644
--- a/src/imports/location/qdeclarativegeoboundingbox.cpp
+++ b/src/imports/location/qdeclarativegeoboundingbox.cpp
@@ -42,7 +42,7 @@
 #include <qnumeric.h>
 #include "qdeclarativegeoboundingbox_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass BoundingBox QDeclarativeGeoBoundingBox
@@ -277,4 +277,4 @@ void QDeclarativeGeoBoundingBox::synchronizeDeclarative()
 
 #include "moc_qdeclarativegeoboundingbox_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeoboundingbox_p.h b/src/imports/location/qdeclarativegeoboundingbox_p.h
index 39ea80dc..f7689dcc 100644
--- a/src/imports/location/qdeclarativegeoboundingbox_p.h
+++ b/src/imports/location/qdeclarativegeoboundingbox_p.h
@@ -48,7 +48,7 @@
 #include <QtCore>
 #include <QtDeclarative/qdeclarative.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoBoundingBox : public QObject
 {
@@ -106,7 +106,7 @@ private:
     double m_width;
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoBoundingBox));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoBoundingBox));
 
 #endif // QDECLARATIVEGEOBOUNDINGBOX_P_H
diff --git a/src/imports/location/qdeclarativegeoboundingcircle.cpp b/src/imports/location/qdeclarativegeoboundingcircle.cpp
index 2ef547b7..901b5f3c 100644
--- a/src/imports/location/qdeclarativegeoboundingcircle.cpp
+++ b/src/imports/location/qdeclarativegeoboundingcircle.cpp
@@ -42,7 +42,7 @@
 #include <qnumeric.h>
 #include "qdeclarativegeoboundingcircle_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Yippiaiee! TODO
@@ -109,4 +109,4 @@ void QDeclarativeGeoBoundingCircle::setRadius(const qreal radius)
 
 #include "moc_qdeclarativegeoboundingcircle_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeoboundingcircle_p.h b/src/imports/location/qdeclarativegeoboundingcircle_p.h
index 0dcb625d..b5b372c4 100644
--- a/src/imports/location/qdeclarativegeoboundingcircle_p.h
+++ b/src/imports/location/qdeclarativegeoboundingcircle_p.h
@@ -49,7 +49,7 @@
 #include <QPointer>
 #include <QtDeclarative/qdeclarative.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoBoundingCircle : public QObject
 {
@@ -78,7 +78,7 @@ private:
     QGeoBoundingCircle circle_;
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoBoundingCircle));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoBoundingCircle));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp
index 5cb579e8..e2a90b01 100644
--- a/src/imports/location/qdeclarativegeocodemodel.cpp
+++ b/src/imports/location/qdeclarativegeocodemodel.cpp
@@ -47,7 +47,7 @@
 #include <qgeoserviceprovider.h>
 #include <qgeosearchmanager.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeGeocodeModel::QDeclarativeGeocodeModel(QObject* parent)
     : QAbstractListModel(parent),
@@ -380,4 +380,4 @@ void QDeclarativeGeocodeModel::setAutoUpdate(bool update)
 
 #include "moc_qdeclarativegeocodemodel_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeocodemodel_p.h b/src/imports/location/qdeclarativegeocodemodel_p.h
index 09f4f53b..2f1fd231 100644
--- a/src/imports/location/qdeclarativegeocodemodel_p.h
+++ b/src/imports/location/qdeclarativegeocodemodel_p.h
@@ -53,7 +53,7 @@
 #include <QAbstractListModel>
 #include <QPointer>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoServiceProvider;
 class QGeoSearchManager;
@@ -165,6 +165,6 @@ private:
     QDeclarativeGeoAddress* address_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomaneuver.cpp b/src/imports/location/qdeclarativegeomaneuver.cpp
index 63d08ae8..756479b2 100644
--- a/src/imports/location/qdeclarativegeomaneuver.cpp
+++ b/src/imports/location/qdeclarativegeomaneuver.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativegeomaneuver_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeGeoManeuver::QDeclarativeGeoManeuver(QObject *parent)
     : QObject(parent)
@@ -97,4 +97,4 @@ QDeclarativeCoordinate* QDeclarativeGeoManeuver::waypoint() const
 
 #include "moc_qdeclarativegeomaneuver_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeomaneuver_p.h b/src/imports/location/qdeclarativegeomaneuver_p.h
index b97016c0..4d7bbefd 100644
--- a/src/imports/location/qdeclarativegeomaneuver_p.h
+++ b/src/imports/location/qdeclarativegeomaneuver_p.h
@@ -48,7 +48,7 @@
 
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoManeuver : public QObject
 {
@@ -98,6 +98,6 @@ private:
     QDeclarativeCoordinate* waypoint_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomapcircleobject.cpp b/src/imports/location/qdeclarativegeomapcircleobject.cpp
index 59b64e06..33d40516 100644
--- a/src/imports/location/qdeclarativegeomapcircleobject.cpp
+++ b/src/imports/location/qdeclarativegeomapcircleobject.cpp
@@ -44,7 +44,7 @@
 #include <QColor>
 #include <QBrush>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass MapCircle
@@ -239,5 +239,5 @@ void QDeclarativeGeoMapCircleObject::borderWidthChanged(int width)
 
 #include "moc_qdeclarativegeomapcircleobject_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomapcircleobject_p.h b/src/imports/location/qdeclarativegeomapcircleobject_p.h
index 57027232..a233ba7c 100644
--- a/src/imports/location/qdeclarativegeomapcircleobject_p.h
+++ b/src/imports/location/qdeclarativegeomapcircleobject_p.h
@@ -50,7 +50,7 @@
 class QColor;
 class QBrush;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapCircleObject : public QDeclarativeGeoMapObject
 {
@@ -95,8 +95,8 @@ private:
     QDeclarativeGeoMapObjectBorder border_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapCircleObject));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapCircleObject));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomapgroupobject.cpp b/src/imports/location/qdeclarativegeomapgroupobject.cpp
index 29cbb0c8..583eb6ce 100644
--- a/src/imports/location/qdeclarativegeomapgroupobject.cpp
+++ b/src/imports/location/qdeclarativegeomapgroupobject.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativegeomapgroupobject_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass MapGroup
@@ -241,5 +241,5 @@ void QDeclarativeGeoMapGroupObject::moveEvent(QDeclarativeGeoMapMouseEvent *even
 
 #include "moc_qdeclarativegeomapgroupobject_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomapgroupobject_p.h b/src/imports/location/qdeclarativegeomapgroupobject_p.h
index 3ccf4db8..0621bf16 100644
--- a/src/imports/location/qdeclarativegeomapgroupobject_p.h
+++ b/src/imports/location/qdeclarativegeomapgroupobject_p.h
@@ -48,7 +48,7 @@
 #include <QtDeclarative/qdeclarative.h>
 #include <QDeclarativeListProperty>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 
@@ -85,8 +85,8 @@ private:
     QList<QDeclarativeGeoMapObject*> objects_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapGroupObject));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapGroupObject));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp
index eb3c4d21..52dc48ed 100644
--- a/src/imports/location/qdeclarativegeomapmousearea.cpp
+++ b/src/imports/location/qdeclarativegeomapmousearea.cpp
@@ -45,7 +45,7 @@
 
 #include "qdeclarativegeomapobject_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass MapMouseArea QDeclarativeGeoMapMouseArea
@@ -425,4 +425,4 @@ void QDeclarativeGeoMapMouseArea::moveEvent(QDeclarativeGeoMapMouseEvent *event)
 
 #include "moc_qdeclarativegeomapmousearea_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeomapmousearea_p.h b/src/imports/location/qdeclarativegeomapmousearea_p.h
index d7c386c8..7591c076 100644
--- a/src/imports/location/qdeclarativegeomapmousearea_p.h
+++ b/src/imports/location/qdeclarativegeomapmousearea_p.h
@@ -48,7 +48,7 @@
 
 #include <QtDeclarative/qdeclarativeitem.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapMouseArea : public QDeclarativeItem
 {
@@ -139,8 +139,8 @@ private:
     QDeclarativeGraphicsGeoMap* map_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseArea));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseArea));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomapmouseevent.cpp b/src/imports/location/qdeclarativegeomapmouseevent.cpp
index 51d717f7..dae077d9 100644
--- a/src/imports/location/qdeclarativegeomapmouseevent.cpp
+++ b/src/imports/location/qdeclarativegeomapmouseevent.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativegeomapmouseevent_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass MapMouseEvent QDeclarativeGeoMapMouseEvent
@@ -199,4 +199,4 @@ QDeclarativeCoordinate* QDeclarativeGeoMapMouseEvent::coordinate()
 
 #include "moc_qdeclarativegeomapmouseevent_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeomapmouseevent_p.h b/src/imports/location/qdeclarativegeomapmouseevent_p.h
index 5949e280..c2be2f65 100644
--- a/src/imports/location/qdeclarativegeomapmouseevent_p.h
+++ b/src/imports/location/qdeclarativegeomapmouseevent_p.h
@@ -46,7 +46,7 @@
 
 #include <QtDeclarative/qdeclarative.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapMouseEvent : public QObject
 {
@@ -95,8 +95,8 @@ private:
     QDeclarativeCoordinate *coordinate_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseEvent));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseEvent));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomapobject.cpp b/src/imports/location/qdeclarativegeomapobject.cpp
index 7ecb0c92..07911e47 100644
--- a/src/imports/location/qdeclarativegeomapobject.cpp
+++ b/src/imports/location/qdeclarativegeomapobject.cpp
@@ -48,7 +48,7 @@
 #include <QAbstractItemModel>
 #include <QDeclarativeContext>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeGeoMapObject::QDeclarativeGeoMapObject(QDeclarativeItem *parent)
     : QDeclarativeItem(parent),
@@ -481,4 +481,4 @@ qreal QDeclarativeGeoMapObjectView::zValue()
 
 #include "moc_qdeclarativegeomapobject_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeomapobject_p.h b/src/imports/location/qdeclarativegeomapobject_p.h
index e17619ca..933ea792 100644
--- a/src/imports/location/qdeclarativegeomapobject_p.h
+++ b/src/imports/location/qdeclarativegeomapobject_p.h
@@ -50,7 +50,7 @@
 #include <QtDeclarative/qdeclarativeitem.h>
 class QAbstractItemModel;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGraphicsGeoMap;
 class QDeclarativeGeoMapMouseArea;
@@ -152,8 +152,8 @@ private:
     QList<QDeclarativeGeoMapObject*> declarativeObjectList_;
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapObject));
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectView));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapObject));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectView));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomapobjectborder.cpp b/src/imports/location/qdeclarativegeomapobjectborder.cpp
index aadb51ec..f40e0e56 100644
--- a/src/imports/location/qdeclarativegeomapobjectborder.cpp
+++ b/src/imports/location/qdeclarativegeomapobjectborder.cpp
@@ -44,7 +44,7 @@
 #include <QColor>
 #include <QBrush>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeGeoMapObjectBorder::QDeclarativeGeoMapObjectBorder(QObject *parent)
     : QObject(parent),
@@ -82,5 +82,5 @@ int QDeclarativeGeoMapObjectBorder::width() const
 
 #include "moc_qdeclarativegeomapobjectborder_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomapobjectborder_p.h b/src/imports/location/qdeclarativegeomapobjectborder_p.h
index 75f34a08..ac415cc9 100644
--- a/src/imports/location/qdeclarativegeomapobjectborder_p.h
+++ b/src/imports/location/qdeclarativegeomapobjectborder_p.h
@@ -48,7 +48,7 @@
 #include <QObject>
 #include <QColor>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapObjectBorder : public QObject
 {
@@ -77,8 +77,8 @@ private:
     Q_DISABLE_COPY(QDeclarativeGeoMapObjectBorder)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectBorder));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectBorder));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomappixmapobject.cpp b/src/imports/location/qdeclarativegeomappixmapobject.cpp
index 4533fe8f..cbcad10a 100644
--- a/src/imports/location/qdeclarativegeomappixmapobject.cpp
+++ b/src/imports/location/qdeclarativegeomappixmapobject.cpp
@@ -53,7 +53,7 @@
 
 #include <QDebug>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass MapImage
@@ -349,5 +349,5 @@ void QDeclarativeGeoMapPixmapObject::error(QNetworkReply::NetworkError error)
 
 #include "moc_qdeclarativegeomappixmapobject_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomappixmapobject_p.h b/src/imports/location/qdeclarativegeomappixmapobject_p.h
index bf869efb..bfcee234 100644
--- a/src/imports/location/qdeclarativegeomappixmapobject_p.h
+++ b/src/imports/location/qdeclarativegeomappixmapobject_p.h
@@ -50,7 +50,7 @@
 #include <QUrl>
 #include <QNetworkReply>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapPixmapObject : public QDeclarativeGeoMapObject
 {
@@ -110,8 +110,8 @@ private:
     Q_DISABLE_COPY(QDeclarativeGeoMapPixmapObject)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapPixmapObject));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapPixmapObject));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomappolygonobject.cpp b/src/imports/location/qdeclarativegeomappolygonobject.cpp
index dfea44ef..67ef8c3a 100644
--- a/src/imports/location/qdeclarativegeomappolygonobject.cpp
+++ b/src/imports/location/qdeclarativegeomappolygonobject.cpp
@@ -47,7 +47,7 @@
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass MapPolygon
@@ -323,5 +323,5 @@ Q_INVOKABLE void QDeclarativeGeoMapPolygonObject::clearCoordinates()
 
 #include "moc_qdeclarativegeomappolygonobject_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomappolygonobject_p.h b/src/imports/location/qdeclarativegeomappolygonobject_p.h
index 700693d5..bd639fc5 100644
--- a/src/imports/location/qdeclarativegeomappolygonobject_p.h
+++ b/src/imports/location/qdeclarativegeomappolygonobject_p.h
@@ -52,7 +52,7 @@
 class QColor;
 class QBrush;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapPolygonObject : public QDeclarativeGeoMapObject
 {
@@ -103,8 +103,8 @@ private:
     bool componentCompleted_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapPolygonObject));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapPolygonObject));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomappolylineobject.cpp b/src/imports/location/qdeclarativegeomappolylineobject.cpp
index b10aed43..245f1785 100644
--- a/src/imports/location/qdeclarativegeomappolylineobject.cpp
+++ b/src/imports/location/qdeclarativegeomappolylineobject.cpp
@@ -47,7 +47,7 @@
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass MapPolyline
@@ -297,5 +297,5 @@ void QDeclarativeGeoMapPolylineObject::removeCoordinate(QDeclarativeCoordinate*
 
 #include "moc_qdeclarativegeomappolylineobject_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomappolylineobject_p.h b/src/imports/location/qdeclarativegeomappolylineobject_p.h
index 7bd63129..2e8f114a 100644
--- a/src/imports/location/qdeclarativegeomappolylineobject_p.h
+++ b/src/imports/location/qdeclarativegeomappolylineobject_p.h
@@ -52,7 +52,7 @@
 class QColor;
 class QBrush;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapPolylineObject : public QDeclarativeGeoMapObject
 {
@@ -96,8 +96,8 @@ private:
     bool componentCompleted_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapPolylineObject));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapPolylineObject));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomaprectangleobject.cpp b/src/imports/location/qdeclarativegeomaprectangleobject.cpp
index c49ea49e..393422aa 100644
--- a/src/imports/location/qdeclarativegeomaprectangleobject.cpp
+++ b/src/imports/location/qdeclarativegeomaprectangleobject.cpp
@@ -47,7 +47,7 @@
 #include <QColor>
 #include <QBrush>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass MapRectangle
@@ -274,5 +274,5 @@ void QDeclarativeGeoMapRectangleObject::borderWidthChanged(int width)
 
 #include "moc_qdeclarativegeomaprectangleobject_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomaprectangleobject_p.h b/src/imports/location/qdeclarativegeomaprectangleobject_p.h
index ccd5a4f3..b9eabf0d 100644
--- a/src/imports/location/qdeclarativegeomaprectangleobject_p.h
+++ b/src/imports/location/qdeclarativegeomaprectangleobject_p.h
@@ -50,7 +50,7 @@
 class QColor;
 class QBrush;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapRectangleObject : public QDeclarativeGeoMapObject
 {
@@ -101,8 +101,8 @@ private:
     QDeclarativeGeoMapObjectBorder border_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapRectangleObject));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapRectangleObject));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomaprouteobject.cpp b/src/imports/location/qdeclarativegeomaprouteobject.cpp
index 8739a2cf..e5e00d6c 100644
--- a/src/imports/location/qdeclarativegeomaprouteobject.cpp
+++ b/src/imports/location/qdeclarativegeomaprouteobject.cpp
@@ -42,7 +42,7 @@
 #include <QPen>
 #include "qdeclarativegeomaprouteobject_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeGeoMapRouteObject::QDeclarativeGeoMapRouteObject(QDeclarativeItem *parent)
     : QDeclarativeGeoMapObject(parent), route_(0)
@@ -104,4 +104,4 @@ quint32 QDeclarativeGeoMapRouteObject::detailLevel() const
 
 #include "moc_qdeclarativegeomaprouteobject_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeomaprouteobject_p.h b/src/imports/location/qdeclarativegeomaprouteobject_p.h
index 04df9930..e170b9ea 100644
--- a/src/imports/location/qdeclarativegeomaprouteobject_p.h
+++ b/src/imports/location/qdeclarativegeomaprouteobject_p.h
@@ -47,7 +47,7 @@
 #include "qdeclarativegeoroute_p.h"
 #include "qgeomaprouteobject.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapRouteObject : public QDeclarativeGeoMapObject
 {
@@ -83,8 +83,8 @@ private:
     QColor color_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapRouteObject));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapRouteObject));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeomaptextobject.cpp b/src/imports/location/qdeclarativegeomaptextobject.cpp
index b54943ca..6f609ca2 100644
--- a/src/imports/location/qdeclarativegeomaptextobject.cpp
+++ b/src/imports/location/qdeclarativegeomaptextobject.cpp
@@ -45,7 +45,7 @@
 #include <QPen>
 #include <QBrush>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass MapText
@@ -402,5 +402,5 @@ void QDeclarativeGeoMapTextObject::setVerticalAlignment(QDeclarativeGeoMapTextOb
 
 #include "moc_qdeclarativegeomaptextobject_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomaptextobject_p.h b/src/imports/location/qdeclarativegeomaptextobject_p.h
index 3f54b106..d927b950 100644
--- a/src/imports/location/qdeclarativegeomaptextobject_p.h
+++ b/src/imports/location/qdeclarativegeomaptextobject_p.h
@@ -48,7 +48,7 @@
 
 #include <QColor>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapTextObject : public QDeclarativeGeoMapObject
 {
@@ -123,8 +123,8 @@ private:
     VerticalAlignment vAlignment_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapTextObject));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapTextObject));
 
 #endif
diff --git a/src/imports/location/qdeclarativegeoplace.cpp b/src/imports/location/qdeclarativegeoplace.cpp
index 7e607207..e09c353f 100644
--- a/src/imports/location/qdeclarativegeoplace.cpp
+++ b/src/imports/location/qdeclarativegeoplace.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativegeoplace_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Place QDeclarativeGeoPlace
@@ -155,4 +155,4 @@ void QDeclarativeGeoPlace::setAddress(QDeclarativeGeoAddress* address)
 
 #include "moc_qdeclarativegeoplace_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeoplace_p.h b/src/imports/location/qdeclarativegeoplace_p.h
index fb638514..1e4de063 100644
--- a/src/imports/location/qdeclarativegeoplace_p.h
+++ b/src/imports/location/qdeclarativegeoplace_p.h
@@ -50,7 +50,7 @@
 #include <QVariant>
 #include <QtDeclarative/qdeclarative.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoPlace : public QObject
 {
@@ -85,10 +85,10 @@ private:
     QDeclarativeGeoAddress m_declarativeAddress;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QGeoPlace))
+Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGeoPlace))
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoPlace));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoPlace));
 
 #endif // QDECLARATIVEGEOPLACE_P_H
diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp
index 3b4e89aa..a211d84a 100644
--- a/src/imports/location/qdeclarativegeoroute.cpp
+++ b/src/imports/location/qdeclarativegeoroute.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativegeoroute_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeGeoRoute::QDeclarativeGeoRoute(QObject *parent)
     : QObject(parent)
@@ -150,4 +150,4 @@ void QDeclarativeGeoRoute::segments_clear(QDeclarativeListProperty<QDeclarativeG
 
 #include "moc_qdeclarativegeoroute_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeoroute_p.h b/src/imports/location/qdeclarativegeoroute_p.h
index 0f090ccf..f2124b04 100644
--- a/src/imports/location/qdeclarativegeoroute_p.h
+++ b/src/imports/location/qdeclarativegeoroute_p.h
@@ -50,7 +50,7 @@
 
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoRoute : public QObject
 {
@@ -93,6 +93,6 @@ private:
     friend class QDeclarativeGeoMapRouteObject;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp
index 45ba1b72..b709b78a 100644
--- a/src/imports/location/qdeclarativegeoroutemodel.cpp
+++ b/src/imports/location/qdeclarativegeoroutemodel.cpp
@@ -46,7 +46,7 @@
 #include <qgeoroutingmanager.h>
 #include <QtDeclarative/qdeclarativeinfo.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeGeoRouteModel::QDeclarativeGeoRouteModel(QObject *parent)
     : QAbstractListModel(parent),
@@ -697,4 +697,4 @@ QGeoRouteRequest& QDeclarativeGeoRouteQuery::routeRequest()
 
 #include "moc_qdeclarativegeoroutemodel_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeoroutemodel_p.h b/src/imports/location/qdeclarativegeoroutemodel_p.h
index 96143f9e..caff16bf 100644
--- a/src/imports/location/qdeclarativegeoroutemodel_p.h
+++ b/src/imports/location/qdeclarativegeoroutemodel_p.h
@@ -56,7 +56,7 @@
 
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoServiceProvider;
 class QGeoRoutingManager;
@@ -310,6 +310,6 @@ private:
 
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/imports/location/qdeclarativegeoroutesegment.cpp
index a88a3239..31c4e0bc 100644
--- a/src/imports/location/qdeclarativegeoroutesegment.cpp
+++ b/src/imports/location/qdeclarativegeoroutesegment.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativegeoroutesegment_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeGeoRouteSegment::QDeclarativeGeoRouteSegment(QObject *parent)
     : QObject(parent)
@@ -111,4 +111,4 @@ void QDeclarativeGeoRouteSegment::path_clear(QDeclarativeListProperty<QDeclarati
 
 #include "moc_qdeclarativegeoroutesegment_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeoroutesegment_p.h b/src/imports/location/qdeclarativegeoroutesegment_p.h
index bbabd654..810c6e4c 100644
--- a/src/imports/location/qdeclarativegeoroutesegment_p.h
+++ b/src/imports/location/qdeclarativegeoroutesegment_p.h
@@ -48,7 +48,7 @@
 
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoRouteSegment : public QObject
 {
@@ -79,6 +79,6 @@ private:
     QList<QDeclarativeCoordinate*> path_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/imports/location/qdeclarativegeoroutingmodel.cpp b/src/imports/location/qdeclarativegeoroutingmodel.cpp
index 7ec49bf3..288ab1c8 100644
--- a/src/imports/location/qdeclarativegeoroutingmodel.cpp
+++ b/src/imports/location/qdeclarativegeoroutingmodel.cpp
@@ -45,7 +45,7 @@
 #include <qgeoserviceprovider.h>
 #include <qgeoroutingmanager.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeGeoRoutingModel::QDeclarativeGeoRoutingModel(QObject *parent)
     : QAbstractListModel(parent),
@@ -387,4 +387,4 @@ void QDeclarativeGeoRoutingModel::routingError(QGeoRouteReply *reply,
 
 #include "moc_qdeclarativegeoroutingmodel_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeoroutingmodel_p.h b/src/imports/location/qdeclarativegeoroutingmodel_p.h
index dc233ca8..a3c2a784 100644
--- a/src/imports/location/qdeclarativegeoroutingmodel_p.h
+++ b/src/imports/location/qdeclarativegeoroutingmodel_p.h
@@ -56,7 +56,7 @@
 
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoServiceProvider;
 class QGeoRoutingManager;
@@ -213,6 +213,6 @@ private:
 };
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/imports/location/qdeclarativegeosearchmodel.cpp b/src/imports/location/qdeclarativegeosearchmodel.cpp
index 476472eb..220fffca 100644
--- a/src/imports/location/qdeclarativegeosearchmodel.cpp
+++ b/src/imports/location/qdeclarativegeosearchmodel.cpp
@@ -47,7 +47,7 @@
 #include <qgeoserviceprovider.h>
 #include <qgeosearchmanager.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeGeoSearchModel::QDeclarativeGeoSearchModel(QObject* parent)
     : QAbstractListModel(parent),
@@ -218,4 +218,4 @@ void QDeclarativeGeoSearchModel::setPlaces(const QList<QGeoPlace> &places)
 
 #include "moc_qdeclarativegeosearchmodel_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeosearchmodel_p.h b/src/imports/location/qdeclarativegeosearchmodel_p.h
index d3be1bfb..175a5721 100644
--- a/src/imports/location/qdeclarativegeosearchmodel_p.h
+++ b/src/imports/location/qdeclarativegeosearchmodel_p.h
@@ -50,7 +50,7 @@
 #include <QDeclarativeParserStatus>
 #include <QAbstractListModel>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoServiceProvider;
 class QGeoSearchManager;
@@ -132,6 +132,6 @@ private:
 };
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp
index 91abe887..52321bb8 100644
--- a/src/imports/location/qdeclarativegeoserviceprovider.cpp
+++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp
@@ -47,7 +47,7 @@
 
 #include <QDebug>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Plugin
@@ -328,5 +328,5 @@ QVariant QDeclarativeGeoServiceProviderParameter::value() const
 
 #include "moc_qdeclarativegeoserviceprovider_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h
index d88b3b60..1ddcdd24 100644
--- a/src/imports/location/qdeclarativegeoserviceprovider_p.h
+++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h
@@ -49,7 +49,7 @@
 #include <QString>
 #include <QVariant>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoServiceProviderParameter : public QObject
 {
@@ -138,9 +138,9 @@ private:
     Q_DISABLE_COPY(QDeclarativeGeoServiceProvider)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoServiceProviderParameter));
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoServiceProvider));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoServiceProviderParameter));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoServiceProvider));
 
 #endif
diff --git a/src/imports/location/qdeclarativegraphicsgeomap.cpp b/src/imports/location/qdeclarativegraphicsgeomap.cpp
index ed72cc53..464b0f54 100644
--- a/src/imports/location/qdeclarativegraphicsgeomap.cpp
+++ b/src/imports/location/qdeclarativegraphicsgeomap.cpp
@@ -58,7 +58,7 @@
 
 #include <QDebug>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Map
@@ -912,4 +912,4 @@ int QDeclarativeGraphicsGeoMap::testGetDeclarativeMapObjectCount()
 
 #include "moc_qdeclarativegraphicsgeomap_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegraphicsgeomap_p.h b/src/imports/location/qdeclarativegraphicsgeomap_p.h
index 6b73b15c..d19b6f49 100644
--- a/src/imports/location/qdeclarativegraphicsgeomap_p.h
+++ b/src/imports/location/qdeclarativegraphicsgeomap_p.h
@@ -48,7 +48,7 @@
 
 #include "qdeclarativegeomapobject_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoMapObject;
@@ -207,8 +207,8 @@ private:
     Q_DISABLE_COPY(QDeclarativeGraphicsGeoMap)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGraphicsGeoMap));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGraphicsGeoMap));
 
 #endif
diff --git a/src/imports/location/qdeclarativelandmark.cpp b/src/imports/location/qdeclarativelandmark.cpp
index 1e1527ba..805e279f 100644
--- a/src/imports/location/qdeclarativelandmark.cpp
+++ b/src/imports/location/qdeclarativelandmark.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativelandmark_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Landmark QDeclarativeLandmark
@@ -222,4 +222,4 @@ QLandmark QDeclarativeLandmark::landmark()
 
 #include "moc_qdeclarativelandmark_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativelandmark_p.h b/src/imports/location/qdeclarativelandmark_p.h
index 177a5831..47efd576 100644
--- a/src/imports/location/qdeclarativelandmark_p.h
+++ b/src/imports/location/qdeclarativelandmark_p.h
@@ -57,7 +57,7 @@
 #include <QDebug>
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeLandmark : public QDeclarativeGeoPlace
 {
@@ -108,7 +108,7 @@ private:
     QLandmark m_landmark;
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmark));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmark));
 
 #endif // QDECLARATIVELANDMARK_P_H
diff --git a/src/imports/location/qdeclarativelandmarkcategory.cpp b/src/imports/location/qdeclarativelandmarkcategory.cpp
index 78d480f7..87fa3c1c 100644
--- a/src/imports/location/qdeclarativelandmarkcategory.cpp
+++ b/src/imports/location/qdeclarativelandmarkcategory.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativelandmarkcategory_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass LandmarkCategory QDeclarativeLandmarkCategory
@@ -121,4 +121,4 @@ void QDeclarativeLandmarkCategory::setCategory(const QLandmarkCategory& category
 
 #include "moc_qdeclarativelandmarkcategory_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativelandmarkcategory_p.h b/src/imports/location/qdeclarativelandmarkcategory_p.h
index 9d890b46..db0d7fb8 100644
--- a/src/imports/location/qdeclarativelandmarkcategory_p.h
+++ b/src/imports/location/qdeclarativelandmarkcategory_p.h
@@ -48,7 +48,7 @@
 #include <QAbstractListModel>
 #include <QtCore>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeLandmarkCategory : public QObject
 {
@@ -79,7 +79,7 @@ private:
     void setCategory(const QLandmarkCategory& category);
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkCategory));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkCategory));
 
 #endif // QDECLARATIVELANDMARKCATEGORY_P_H
diff --git a/src/imports/location/qdeclarativelandmarkcategorymodel.cpp b/src/imports/location/qdeclarativelandmarkcategorymodel.cpp
index 9255cae8..28c8cd71 100644
--- a/src/imports/location/qdeclarativelandmarkcategorymodel.cpp
+++ b/src/imports/location/qdeclarativelandmarkcategorymodel.cpp
@@ -48,7 +48,7 @@
 #include <QDebug>
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass LandmarkCategoryModel QDeclarativeLandmarkCategoryModel
@@ -340,4 +340,4 @@ void QDeclarativeLandmarkCategoryModel::categories_clear(QDeclarativeListPropert
 
 #include "moc_qdeclarativelandmarkcategorymodel_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativelandmarkcategorymodel_p.h b/src/imports/location/qdeclarativelandmarkcategorymodel_p.h
index 9d21e337..997eaac8 100644
--- a/src/imports/location/qdeclarativelandmarkcategorymodel_p.h
+++ b/src/imports/location/qdeclarativelandmarkcategorymodel_p.h
@@ -54,7 +54,7 @@
 #include <QtDeclarative/qdeclarative.h>
 #include <QAbstractListModel>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeLandmarkCategoryModel: public QDeclarativeLandmarkAbstractModel
 {
@@ -112,7 +112,7 @@ private:
     QDeclarativeLandmark* m_landmark;
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryModel));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryModel));
 
 #endif // QDECLARATIVELANDMARKCATEGORYMODEL_P_H
diff --git a/src/imports/location/qdeclarativelandmarkfilters.cpp b/src/imports/location/qdeclarativelandmarkfilters.cpp
index 798698b6..d0224a13 100644
--- a/src/imports/location/qdeclarativelandmarkfilters.cpp
+++ b/src/imports/location/qdeclarativelandmarkfilters.cpp
@@ -42,7 +42,7 @@
 #include "qdeclarativelandmarkfilters_p.h"
 #include "qdeclarativeposition_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass LandmarkNameFilter QDeclarativeLandmarkNameFilter
@@ -442,4 +442,4 @@ QLandmarkFilter* QDeclarativeLandmarkIntersectionFilter::filter()
 
 #include "moc_qdeclarativelandmarkfilters_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativelandmarkfilters_p.h b/src/imports/location/qdeclarativelandmarkfilters_p.h
index bd000ed2..7eba5a32 100644
--- a/src/imports/location/qdeclarativelandmarkfilters_p.h
+++ b/src/imports/location/qdeclarativelandmarkfilters_p.h
@@ -56,7 +56,7 @@
 #include <QDeclarativeListProperty>
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeLandmarkFilterBase : public QObject
 {
@@ -229,12 +229,12 @@ private:
     QLandmarkIntersectionFilter m_filter;
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkNameFilter));
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryFilter));
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkBoxFilter));
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkProximityFilter));
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkUnionFilter));
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkIntersectionFilter));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkNameFilter));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryFilter));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkBoxFilter));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkProximityFilter));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkUnionFilter));
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkIntersectionFilter));
 
 #endif // QDECLARATIVELANDMARKFILTERS_P_H
diff --git a/src/imports/location/qdeclarativelandmarkmodel.cpp b/src/imports/location/qdeclarativelandmarkmodel.cpp
index 969c0b7a..ea38e69a 100644
--- a/src/imports/location/qdeclarativelandmarkmodel.cpp
+++ b/src/imports/location/qdeclarativelandmarkmodel.cpp
@@ -47,7 +47,7 @@
 #include <QDebug>
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 /*!
@@ -823,4 +823,4 @@ void QDeclarativeLandmarkModel::fetchRequestStateChanged(QLandmarkAbstractReques
 
 #include "moc_qdeclarativelandmarkmodel_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativelandmarkmodel_p.h b/src/imports/location/qdeclarativelandmarkmodel_p.h
index 86cb24ff..b314e612 100644
--- a/src/imports/location/qdeclarativelandmarkmodel_p.h
+++ b/src/imports/location/qdeclarativelandmarkmodel_p.h
@@ -55,7 +55,7 @@
 #include <QDeclarativeParserStatus>
 #include <QAbstractListModel>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 class QDeclarativeLandmarkAbstractModel : public QAbstractListModel, public QDeclarativeParserStatus
@@ -225,7 +225,7 @@ private:
     QSet<QString> m_landmarkIdSet; // For faster lookups when updating items
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkModel));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkModel));
 
 #endif // QDECLARATIVELANDMARKMODEL_P_H
diff --git a/src/imports/location/qdeclarativeposition.cpp b/src/imports/location/qdeclarativeposition.cpp
index 2619be69..21e41fda 100644
--- a/src/imports/location/qdeclarativeposition.cpp
+++ b/src/imports/location/qdeclarativeposition.cpp
@@ -45,7 +45,7 @@
 #include <QFile>
 #include <QApplication>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Position
@@ -361,4 +361,4 @@ void QDeclarativePosition::invalidate()
 
 #include "moc_qdeclarativeposition_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativeposition_p.h b/src/imports/location/qdeclarativeposition_p.h
index d851af33..ebc8c77b 100644
--- a/src/imports/location/qdeclarativeposition_p.h
+++ b/src/imports/location/qdeclarativeposition_p.h
@@ -56,7 +56,7 @@
 #include <QDebug>
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativePosition : public QObject
 {
@@ -126,7 +126,7 @@ private:
     QDeclarativeCoordinate m_coordinate;
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativePosition));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativePosition));
 
 #endif
diff --git a/src/imports/location/qdeclarativepositionsource.cpp b/src/imports/location/qdeclarativepositionsource.cpp
index 86a194b9..fa434305 100644
--- a/src/imports/location/qdeclarativepositionsource.cpp
+++ b/src/imports/location/qdeclarativepositionsource.cpp
@@ -51,7 +51,7 @@
 #include <e32std.h>
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass PositionSource
@@ -417,4 +417,4 @@ void QDeclarativePositionSource::positionUpdateReceived(const QGeoPositionInfo&
 
 #include "moc_qdeclarativepositionsource_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativepositionsource_p.h b/src/imports/location/qdeclarativepositionsource_p.h
index edfe310f..ab63a678 100644
--- a/src/imports/location/qdeclarativepositionsource_p.h
+++ b/src/imports/location/qdeclarativepositionsource_p.h
@@ -51,7 +51,7 @@
 
 class QFile;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativePositionSource : public QObject
 {
@@ -111,7 +111,7 @@ private:
     int m_updateInterval;
 };
 
-QTM_END_NAMESPACE
-QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativePositionSource));
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativePositionSource));
 
 #endif
diff --git a/src/imports/location/qdeclarativereversegeocodemodel.cpp b/src/imports/location/qdeclarativereversegeocodemodel.cpp
index f019cafd..ecd46014 100644
--- a/src/imports/location/qdeclarativereversegeocodemodel.cpp
+++ b/src/imports/location/qdeclarativereversegeocodemodel.cpp
@@ -43,7 +43,7 @@
 
 #include <qgeosearchmanager.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QDeclarativeReverseGeocodeModel::QDeclarativeReverseGeocodeModel(QObject *parent)
     : QDeclarativeGeoSearchModel(parent),
@@ -141,4 +141,4 @@ QVariant QDeclarativeReverseGeocodeModel::headerData(int section, Qt::Orientatio
 
 #include "moc_qdeclarativereversegeocodemodel_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativereversegeocodemodel_p.h b/src/imports/location/qdeclarativereversegeocodemodel_p.h
index 9d0a1748..fd58e7b6 100644
--- a/src/imports/location/qdeclarativereversegeocodemodel_p.h
+++ b/src/imports/location/qdeclarativereversegeocodemodel_p.h
@@ -46,7 +46,7 @@
 
 #include "qdeclarativecoordinate_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeReverseGeocodeModel : public QDeclarativeGeoSearchModel
 {
@@ -79,6 +79,6 @@ private:
     QDeclarativeCoordinate coordinate_;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/imports/qimportbase.pri b/src/imports/location/qlocationimport.pri
index 405af24e..c4d502ed 100644
--- a/src/imports/qimportbase.pri
+++ b/src/imports/location/qlocationimport.pri
@@ -15,7 +15,7 @@ isEmpty(TARGET) {
 
 QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
 copy2build.input = QMLDIRFILE
-copy2build.output = $$QT.declarative.imports/$$TARGETPATH/qmldir
+copy2build.output = $$QT.location.imports/$$TARGETPATH/qmldir
 !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
 copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 copy2build.name = COPY ${QMAKE_FILE_IN}
diff --git a/src/location/dbuscomm_maemo.cpp b/src/location/dbuscomm_maemo.cpp
index e86655db..9912b36c 100644
--- a/src/location/dbuscomm_maemo.cpp
+++ b/src/location/dbuscomm_maemo.cpp
@@ -44,7 +44,7 @@
 #include <iostream>
 using namespace std;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 const QString DBusComm::positioningdService   = QString("com.nokia.positioningd.client");
 const QString DBusComm::positioningdPath      = QString("/com/nokia/positioningd/client");
@@ -253,5 +253,5 @@ bool DBusComm::createUniqueName()
 }
 
 #include "moc_dbuscomm_maemo_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/dbuscomm_maemo_p.h b/src/location/dbuscomm_maemo_p.h
index b08df739..90d21567 100644
--- a/src/location/dbuscomm_maemo_p.h
+++ b/src/location/dbuscomm_maemo_p.h
@@ -63,7 +63,7 @@
 #include "qgeosatelliteinfosource.h"
 #include "dbusserver_maemo_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class DBusComm: public QObject, DBusServerIF
 {
@@ -123,6 +123,6 @@ private Q_SLOTS:
 
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/dbusserver_maemo.cpp b/src/location/dbusserver_maemo.cpp
index cddccd0b..184cbb6c 100644
--- a/src/location/dbusserver_maemo.cpp
+++ b/src/location/dbusserver_maemo.cpp
@@ -41,7 +41,7 @@
 
 #include "dbusserver_maemo_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 DBusServer::DBusServer(QObject *obj, DBusServerIF *iface) : QDBusAbstractAdaptor(obj), 
                                                             interface(iface) 
@@ -86,5 +86,5 @@ Q_NOREPLY void DBusServer::satellitesInUseUpdate(const QByteArray &message)
 }
 
 #include "moc_dbusserver_maemo_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/dbusserver_maemo_p.h b/src/location/dbusserver_maemo_p.h
index 41e26951..854f449c 100644
--- a/src/location/dbusserver_maemo_p.h
+++ b/src/location/dbusserver_maemo_p.h
@@ -58,7 +58,7 @@
 #include "qgeopositioninfosource.h"
 #include "qgeosatelliteinfo.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class DBusServerIF {
 public:
@@ -88,6 +88,6 @@ private:
     DBusServerIF *interface;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/gconfitem.cpp b/src/location/gconfitem.cpp
deleted file mode 100644
index 508d7664..00000000
--- a/src/location/gconfitem.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Mobility Components.
-**
-** $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$
-**
-****************************************************************************/
-
-#include <QString>
-#include <QStringList>
-#include <QByteArray>
-#include <QVariant>
-#include <QtDebug>
-
-#include "gconfitem_p.h"
-
-#include <glib.h>
-#include <gconf/gconf-value.h>
-#include <gconf/gconf-client.h>
-
-struct GConfItemPrivate {
-    QString key;
-    QVariant value;
-    guint notify_id;
-
-    static void notify_trampoline(GConfClient*, guint, GConfEntry *, gpointer);
-};
-
-#define withClient(c) for(GConfClient *c = (g_type_init(), gconf_client_get_default()); c; g_object_unref(c), c=NULL)
-
-static QByteArray convertKey(QString key)
-{
-    if (key.startsWith('/'))
-        return key.toUtf8();
-    else {
-        qWarning() << "Using dot-separated key names with GConfItem is deprecated.";
-        qWarning() << "Please use" << '/' + key.replace('.', '/') << "instead of" << key;
-        return '/' + key.replace('.', '/').toUtf8();
-    }
-}
-
-static QString convertKey(const char *key)
-{
-    return QString::fromUtf8(key);
-}
-
-static QVariant convertValue(GConfValue *src)
-{
-    if (!src) {
-        return QVariant();
-    } else {
-        switch (src->type) {
-            case GCONF_VALUE_INVALID:
-                return QVariant(QVariant::Invalid);
-            case GCONF_VALUE_BOOL:
-                return QVariant((bool)gconf_value_get_bool(src));
-            case GCONF_VALUE_INT:
-                return QVariant(gconf_value_get_int(src));
-            case GCONF_VALUE_FLOAT:
-                return QVariant(gconf_value_get_float(src));
-            case GCONF_VALUE_STRING:
-                return QVariant(QString::fromUtf8(gconf_value_get_string(src)));
-            case GCONF_VALUE_LIST:
-                switch (gconf_value_get_list_type(src)) {
-                    case GCONF_VALUE_STRING: {
-                        QStringList result;
-                        for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next)
-                            result.append(QString::fromUtf8(gconf_value_get_string((GConfValue *)elts->data)));
-                        return QVariant(result);
-                    }
-                    default: {
-                        QList<QVariant> result;
-                        for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next)
-                            result.append(convertValue((GConfValue *)elts->data));
-                        return QVariant(result);
-                    }
-                }
-            case GCONF_VALUE_SCHEMA:
-            default:
-                return QVariant();
-        }
-    }
-}
-
-static GConfValue *convertString(const QString &str)
-{
-    GConfValue *v = gconf_value_new(GCONF_VALUE_STRING);
-    gconf_value_set_string(v, str.toUtf8().data());
-    return v;
-}
-
-static GConfValueType primitiveType(const QVariant &elt)
-{
-    switch (elt.type()) {
-        case QVariant::String:
-            return GCONF_VALUE_STRING;
-        case QVariant::Int:
-            return GCONF_VALUE_INT;
-        case QVariant::Double:
-            return GCONF_VALUE_FLOAT;
-        case QVariant::Bool:
-            return GCONF_VALUE_BOOL;
-        default:
-            return GCONF_VALUE_INVALID;
-    }
-}
-
-static GConfValueType uniformType(const QList<QVariant> &list)
-{
-    GConfValueType result = GCONF_VALUE_INVALID;
-
-    foreach(const QVariant &elt, list) {
-        GConfValueType elt_type = primitiveType(elt);
-
-        if (elt_type == GCONF_VALUE_INVALID)
-            return GCONF_VALUE_INVALID;
-
-        if (result == GCONF_VALUE_INVALID)
-            result = elt_type;
-        else if (result != elt_type)
-            return GCONF_VALUE_INVALID;
-    }
-
-    if (result == GCONF_VALUE_INVALID)
-        return GCONF_VALUE_STRING;  // empty list.
-    else
-        return result;
-}
-
-static int convertValue(const QVariant &src, GConfValue **valp)
-{
-    GConfValue *v;
-
-    switch (src.type()) {
-        case QVariant::Invalid:
-            v = NULL;
-            break;
-        case QVariant::Bool:
-            v = gconf_value_new(GCONF_VALUE_BOOL);
-            gconf_value_set_bool(v, src.toBool());
-            break;
-        case QVariant::Int:
-            v = gconf_value_new(GCONF_VALUE_INT);
-            gconf_value_set_int(v, src.toInt());
-            break;
-        case QVariant::Double:
-            v = gconf_value_new(GCONF_VALUE_FLOAT);
-            gconf_value_set_float(v, src.toDouble());
-            break;
-        case QVariant::String:
-            v = convertString(src.toString());
-            break;
-        case QVariant::StringList: {
-            GSList *elts = NULL;
-            v = gconf_value_new(GCONF_VALUE_LIST);
-            gconf_value_set_list_type(v, GCONF_VALUE_STRING);
-            foreach(const QString &str, src.toStringList())
-            elts = g_slist_prepend(elts, convertString(str));
-            gconf_value_set_list_nocopy(v, g_slist_reverse(elts));
-            break;
-        }
-        case QVariant::List: {
-            GConfValueType elt_type = uniformType(src.toList());
-            if (elt_type == GCONF_VALUE_INVALID)
-                v = NULL;
-            else {
-                GSList *elts = NULL;
-                v = gconf_value_new(GCONF_VALUE_LIST);
-                gconf_value_set_list_type(v, elt_type);
-                foreach(const QVariant &elt, src.toList()) {
-                    GConfValue *val = NULL;
-                    convertValue(elt, &val);  // guaranteed to succeed.
-                    elts = g_slist_prepend(elts, val);
-                }
-                gconf_value_set_list_nocopy(v, g_slist_reverse(elts));
-            }
-            break;
-        }
-        default:
-            return 0;
-    }
-
-    *valp = v;
-    return 1;
-}
-
-void GConfItemPrivate::notify_trampoline(GConfClient*,
-        guint,
-        GConfEntry *,
-        gpointer data)
-{
-    GConfItem *item = (GConfItem *)data;
-    item->update_value(true);
-}
-
-void GConfItem::update_value(bool emit_signal)
-{
-    QVariant new_value;
-
-    withClient(client) {
-        GError *error = NULL;
-        QByteArray k = convertKey(priv->key);
-        GConfValue *v = gconf_client_get(client, k.data(), &error);
-
-        if (error) {
-            qWarning() << error->message;
-            g_error_free(error);
-            new_value = priv->value;
-        } else {
-            new_value = convertValue(v);
-            if (v)
-                gconf_value_free(v);
-        }
-    }
-
-    if (new_value != priv->value) {
-        priv->value = new_value;
-        if (emit_signal)
-            emit valueChanged();
-    }
-}
-
-QString GConfItem::key() const
-{
-    return priv->key;
-}
-
-QVariant GConfItem::value() const
-{
-    return priv->value;
-}
-
-QVariant GConfItem::value(const QVariant &def) const
-{
-    if (priv->value.isNull())
-        return def;
-    else
-        return priv->value;
-}
-
-void GConfItem::set(const QVariant &val)
-{
-    withClient(client) {
-        QByteArray k = convertKey(priv->key);
-        GConfValue *v;
-        if (convertValue(val, &v)) {
-            GError *error = NULL;
-
-            if (v) {
-                gconf_client_set(client, k.data(), v, &error);
-                gconf_value_free(v);
-            } else {
-                gconf_client_unset(client, k.data(), &error);
-            }
-
-            if (error) {
-                qWarning() << error->message;
-                g_error_free(error);
-            } else if (priv->value != val) {
-                priv->value = val;
-                emit valueChanged();
-            }
-
-        } else
-            qWarning() << "Can't store a" << val.typeName();
-    }
-}
-
-void GConfItem::unset()
-{
-    set(QVariant());
-}
-
-QList<QString> GConfItem::listDirs() const
-{
-    QList<QString> children;
-
-    withClient(client) {
-        QByteArray k = convertKey(priv->key);
-        GSList *dirs = gconf_client_all_dirs(client, k.data(), NULL);
-        for (GSList *d = dirs; d; d = d->next) {
-            children.append(convertKey((char *)d->data));
-            g_free(d->data);
-        }
-        g_slist_free(dirs);
-    }
-
-    return children;
-}
-
-QList<QString> GConfItem::listEntries() const
-{
-    QList<QString> children;
-
-    withClient(client) {
-        QByteArray k = convertKey(priv->key);
-        GSList *entries = gconf_client_all_entries(client, k.data(), NULL);
-        for (GSList *e = entries; e; e = e->next) {
-            children.append(convertKey(((GConfEntry *)e->data)->key));
-            gconf_entry_free((GConfEntry *)e->data);
-        }
-        g_slist_free(entries);
-    }
-
-    return children;
-}
-
-GConfItem::GConfItem(const QString &key, QObject *parent)
-        : QObject(parent)
-{
-    priv = new GConfItemPrivate;
-    priv->key = key;
-    withClient(client) {
-        update_value(false);
-        QByteArray k = convertKey(priv->key);
-        gconf_client_add_dir(client, k.data(), GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-        priv->notify_id = gconf_client_notify_add(client, k.data(),
-                          GConfItemPrivate::notify_trampoline, this,
-                          NULL, NULL);
-    }
-}
-
-GConfItem::~GConfItem()
-{
-    withClient(client) {
-        QByteArray k = convertKey(priv->key);
-        gconf_client_notify_remove(client, priv->notify_id);
-        gconf_client_remove_dir(client, k.data(), NULL);
-    }
-    delete priv;
-}
diff --git a/src/location/gconfitem_p.h b/src/location/gconfitem_p.h
deleted file mode 100644
index ba4c8d63..00000000
--- a/src/location/gconfitem_p.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Mobility Components.
-**
-** $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 GCONFITEM_H
-#define GCONFITEM_H
-
-#include <QVariant>
-#include <QStringList>
-#include <QObject>
-
-/*!
-
-  \brief GConfItem is a simple C++ wrapper for GConf.
-
-  Creating a GConfItem instance gives you access to a single GConf
-  key.  You can get and set its value, and connect to its
-  valueChanged() signal to be notified about changes.
-
-  The value of a GConf key is returned to you as a QVariant, and you
-  pass in a QVariant when setting the value.  GConfItem converts
-  between a QVariant and GConf values as needed, and according to the
-  following rules:
-
-  - A QVariant of type QVariant::Invalid denotes an unset GConf key.
-
-  - QVariant::Int, QVariant::Double, QVariant::Bool are converted to
-    and from the obvious equivalents.
-
-  - QVariant::String is converted to/from a GConf string and always
-    uses the UTF-8 encoding.  No other encoding is supported.
-
-  - QVariant::StringList is converted to a list of UTF-8 strings.
-
-  - QVariant::List (which denotes a QList<QVariant>) is converted
-    to/from a GConf list.  All elements of such a list must have the
-    same type, and that type must be one of QVariant::Int,
-    QVariant::Double, QVariant::Bool, or QVariant::String.  (A list of
-    strings is returned as a QVariant::StringList, however, when you
-    get it back.)
-
-  - Any other QVariant or GConf value is essentially ignored.
-
-  \warning GConfItem is as thread-safe as GConf.
-
-*/
-
-class GConfItem : public QObject
-{
-    Q_OBJECT
-
-public:
-    /*! Initializes a GConfItem to access the GConf key denoted by
-        \a key.  Key names should follow the normal GConf conventions
-        like "/myapp/settings/first".
-
-        \param key    The name of the key.
-        \param parent Parent object
-    */
-    explicit GConfItem(const QString &key, QObject *parent = 0);
-
-    /*! Finalizes a GConfItem.
-     */
-    virtual ~GConfItem();
-
-    /*! Returns the key of this item, as given to the constructor.
-     */
-    QString key() const;
-
-    /*! Returns the current value of this item, as a QVariant.
-     */
-    QVariant value() const;
-
-    /*! Returns the current value of this item, as a QVariant.  If
-     *  there is no value for this item, return \a def instead.
-     */
-    QVariant value(const QVariant &def) const;
-
-    /*! Set the value of this item to \a val.  If \a val can not be
-        represented in GConf or GConf refuses to accept it for other
-        reasons, the current value is not changed and nothing happens.
-
-        When the new value is different from the old value, the
-        changedValue() signal is emitted on this GConfItem as part
-        of calling set(), but other GConfItem:s for the same key do
-        only receive a notification once the main loop runs.
-
-        \param val  The new value.
-    */
-    void set(const QVariant &val);
-
-    /*! Unset this item.  This is equivalent to
-
-        \code
-        item.set(QVariant(QVariant::Invalid));
-        \endcode
-     */
-    void unset();
-
-    /*! Return a list of the directories below this item.  The
-        returned strings are absolute key names like
-        "/myapp/settings".
-
-        A directory is a key that has children.  The same key might
-        also have a value, but that is confusing and best avoided.
-    */
-    QList<QString> listDirs() const;
-
-    /*! Return a list of entries below this item.  The returned
-        strings are absolute key names like "/myapp/settings/first".
-
-        A entry is a key that has a value.  The same key might also
-        have children, but that is confusing and is best avoided.
-    */
-    QList<QString> listEntries() const;
-
-signals:
-    /*! Emitted when the value of this item has changed.
-     */
-    void valueChanged();
-
-private:
-    friend struct GConfItemPrivate;
-    struct GConfItemPrivate *priv;
-
-    void update_value(bool emit_signal);
-};
-
-#endif // GCONFITEM_H
diff --git a/src/location/landmarks/qlandmark.cpp b/src/location/landmarks/qlandmark.cpp
index 27a060d8..f1b42402 100644
--- a/src/location/landmarks/qlandmark.cpp
+++ b/src/location/landmarks/qlandmark.cpp
@@ -62,13 +62,12 @@
 #include <QDebug>
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 uint qHash(const QLandmarkCategoryId& key) {
    return qHash(key.localId()) + qHash(key.managerUri());
 }
-QTM_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+
 
 // ----- QLandmarkPrivate -----
 
@@ -522,3 +521,4 @@ void QLandmark::clear()
     d->id = QLandmarkId();
 }
 
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmark.h b/src/location/landmarks/qlandmark.h
index b0ef9593..08adcb22 100644
--- a/src/location/landmarks/qlandmark.h
+++ b/src/location/landmarks/qlandmark.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkPrivate;
 class Q_LOCATION_EXPORT QLandmark : public QGeoPlace
@@ -104,11 +104,11 @@ private:
     const QLandmarkPrivate* d_func() const;
 };
 
-QTM_END_NAMESPACE
+Q_DECLARE_TYPEINFO(QLandmark, Q_MOVABLE_TYPE);
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmark))
+QT_END_NAMESPACE
 
-Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmark), Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(QLandmark)
 
 QT_END_HEADER
 
diff --git a/src/location/landmarks/qlandmark_p.h b/src/location/landmarks/qlandmark_p.h
index 68fd4809..f989d8dc 100644
--- a/src/location/landmarks/qlandmark_p.h
+++ b/src/location/landmarks/qlandmark_p.h
@@ -60,7 +60,7 @@
 #include <QSharedData>
 #include <QUrl>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkPrivate : public QGeoPlacePrivate
 {
@@ -86,6 +86,6 @@ public:
     static QStringList commonKeys;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkabstractrequest.cpp b/src/location/landmarks/qlandmarkabstractrequest.cpp
index e8a0e131..f5cc51f8 100644
--- a/src/location/landmarks/qlandmarkabstractrequest.cpp
+++ b/src/location/landmarks/qlandmarkabstractrequest.cpp
@@ -45,7 +45,8 @@
 #include <QDebug>
 #include <QMutexLocker>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
+
 
 QLandmarkAbstractRequestPrivate::QLandmarkAbstractRequestPrivate(QLandmarkManager *mgr)
     : type(QLandmarkAbstractRequest::InvalidRequest),
@@ -324,14 +325,14 @@ bool QLandmarkAbstractRequest::start()
     QMutexLocker ml(&d_ptr->mutex);
     if (!d_ptr->manager) {
         d_ptr->error = QLandmarkManager::BadArgumentError;
-        d_ptr->errorString = "No manager assigned to landmark request object";
+        d_ptr->errorString = QLatin1String("No manager assigned to landmark request object");
         qWarning() << d_ptr->errorString;
         return false;
     }
     QLandmarkManagerEngine *engine = d_ptr->manager->engine();
     if (!engine) {
         d_ptr->error = QLandmarkManager::InvalidManagerError;
-        d_ptr->errorString = "The manager is invalid";
+        d_ptr->errorString = QLatin1String("The manager is invalid");
         return false;
     }
 
@@ -361,7 +362,7 @@ bool QLandmarkAbstractRequest::cancel()
     QMutexLocker ml(&d_ptr->mutex);
     if (!d_ptr->manager) {
         d_ptr->error = QLandmarkManager::BadArgumentError;
-        d_ptr->errorString = "No manager assigned to landmark request object";
+        d_ptr->errorString = QLatin1String("No manager assigned to landmark request object");
         qWarning() << d_ptr->errorString;
         return false;
     }
@@ -400,7 +401,7 @@ bool QLandmarkAbstractRequest::waitForFinished(int msecs)
     QMutexLocker ml(&d_ptr->mutex);
     if (!d_ptr->manager) {
         d_ptr->error = QLandmarkManager::BadArgumentError;
-        d_ptr->errorString = "No manager assigned to landmark request object";
+        d_ptr->errorString = QLatin1String("No manager assigned to landmark request object");
         qWarning() << d_ptr->errorString;
         return false;
     }
@@ -437,6 +438,8 @@ bool QLandmarkAbstractRequest::waitForFinished(int msecs)
 
 #include "moc_qlandmarkabstractrequest.cpp"
 
+QT_END_NAMESPACE
+
 
 
 
diff --git a/src/location/landmarks/qlandmarkabstractrequest.h b/src/location/landmarks/qlandmarkabstractrequest.h
index 9ecc90a5..4c1f88d1 100644
--- a/src/location/landmarks/qlandmarkabstractrequest.h
+++ b/src/location/landmarks/qlandmarkabstractrequest.h
@@ -45,7 +45,7 @@
 #include "qlandmarkmanager.h"
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkAbstractRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkAbstractRequest : public QObject
@@ -108,6 +108,6 @@ private:
     friend class QLandmarkAbstractRequestPrivate;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkabstractrequest_p.h b/src/location/landmarks/qlandmarkabstractrequest_p.h
index 1f79ae2c..79fd36e0 100644
--- a/src/location/landmarks/qlandmarkabstractrequest_p.h
+++ b/src/location/landmarks/qlandmarkabstractrequest_p.h
@@ -58,7 +58,7 @@
 
 #include "qlandmarkabstractrequest.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkAbstractRequestPrivate
 {
@@ -76,6 +76,6 @@ public:
     mutable QMutex mutex;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkattributefilter.cpp b/src/location/landmarks/qlandmarkattributefilter.cpp
index 8131730a..f2bda00c 100644
--- a/src/location/landmarks/qlandmarkattributefilter.cpp
+++ b/src/location/landmarks/qlandmarkattributefilter.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkfilter_p.h"
 #include <QHash>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkAttributeFilterPrivate : public QLandmarkFilterPrivate
 {
@@ -277,4 +277,4 @@ QLandmarkFilter::MatchFlags QLandmarkAttributeFilter::matchFlags(const QString &
     return d->flags.value(key);
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkattributefilter.h b/src/location/landmarks/qlandmarkattributefilter.h
index cb4d0917..4bbadf64 100644
--- a/src/location/landmarks/qlandmarkattributefilter.h
+++ b/src/location/landmarks/qlandmarkattributefilter.h
@@ -47,7 +47,7 @@
 #include <QString>
 #include <QStringList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QLandmark;
 
 class QLandmarkAttributeFilterPrivate;
@@ -76,6 +76,6 @@ private:
     Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkAttributeFilter)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkboxfilter.cpp b/src/location/landmarks/qlandmarkboxfilter.cpp
index ce9a3c88..6c32b8a2 100644
--- a/src/location/landmarks/qlandmarkboxfilter.cpp
+++ b/src/location/landmarks/qlandmarkboxfilter.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkboxfilter_p.h"
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkBoxFilter
@@ -170,4 +170,4 @@ QLandmarkBoxFilterPrivate::QLandmarkBoxFilterPrivate(const QLandmarkBoxFilterPri
 
 QLandmarkBoxFilterPrivate::~QLandmarkBoxFilterPrivate() {}
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkboxfilter.h b/src/location/landmarks/qlandmarkboxfilter.h
index cefd788f..6f524c4e 100644
--- a/src/location/landmarks/qlandmarkboxfilter.h
+++ b/src/location/landmarks/qlandmarkboxfilter.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkBoxFilterPrivate;
 class Q_LOCATION_EXPORT QLandmarkBoxFilter : public QLandmarkFilter
@@ -74,7 +74,7 @@ private:
     Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkBoxFilter)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/landmarks/qlandmarkboxfilter_p.h b/src/location/landmarks/qlandmarkboxfilter_p.h
index 8e94b43f..851202f9 100644
--- a/src/location/landmarks/qlandmarkboxfilter_p.h
+++ b/src/location/landmarks/qlandmarkboxfilter_p.h
@@ -56,7 +56,7 @@
 #include "qlandmarkfilter_p.h"
 #include "qgeoboundingbox.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 
@@ -78,6 +78,6 @@ public:
     QGeoBoundingBox boundingBox;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkcategory.cpp b/src/location/landmarks/qlandmarkcategory.cpp
index bb5d1662..dc3e2870 100644
--- a/src/location/landmarks/qlandmarkcategory.cpp
+++ b/src/location/landmarks/qlandmarkcategory.cpp
@@ -50,7 +50,7 @@
 #include <QDebug>
 #endif
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 // ----- QLandmarkCategoryPrivate -----
 
@@ -255,3 +255,5 @@ void QLandmarkCategory::clear()
     d->iconUrl.clear();
     d->id = QLandmarkCategoryId();
 }
+
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkcategory.h b/src/location/landmarks/qlandmarkcategory.h
index 00edcb01..9f1a7cfc 100644
--- a/src/location/landmarks/qlandmarkcategory.h
+++ b/src/location/landmarks/qlandmarkcategory.h
@@ -46,13 +46,12 @@
 #include <QVariant>
 #include <QSharedDataPointer>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
 
 class QStringList;
 class QUrl;
-
-QT_BEGIN_HEADER
-
-QTM_BEGIN_NAMESPACE
 class QLandmarkCategoryId;
 
 class QLandmarkCategoryPrivate;
@@ -82,11 +81,11 @@ private:
     QSharedDataPointer<QLandmarkCategoryPrivate> d;
 };
 
-QTM_END_NAMESPACE
+Q_DECLARE_TYPEINFO(QLandmarkCategory, Q_MOVABLE_TYPE);
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkCategory))
+QT_END_NAMESPACE
 
-Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkCategory), Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(QLandmarkCategory)
 
 QT_END_HEADER
 
diff --git a/src/location/landmarks/qlandmarkcategory_p.h b/src/location/landmarks/qlandmarkcategory_p.h
index bba844b6..87c90b7c 100644
--- a/src/location/landmarks/qlandmarkcategory_p.h
+++ b/src/location/landmarks/qlandmarkcategory_p.h
@@ -58,7 +58,7 @@
 #include <QUrl>
 #include <QSharedData>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkCategoryPrivate : public QSharedData
 {
@@ -79,6 +79,6 @@ public:
 };
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp
index 0d0df7b1..7fdf9a60 100644
--- a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp
+++ b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkrequests_p.h"
 #include "qlandmarkcategory.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkCategoryFetchByIdRequest
@@ -146,4 +146,4 @@ QMap<int, QLandmarkManager::Error> QLandmarkCategoryFetchByIdRequest::errorMap()
 
 #include "moc_qlandmarkcategoryfetchbyidrequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h
index 9ebc9647..3e01b91b 100644
--- a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h
+++ b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h
@@ -45,7 +45,7 @@
 #include "qlandmarkabstractrequest.h"
 #include "qlandmarkcategoryid.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkCategoryFetchByIdRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkCategoryFetchByIdRequest : public QLandmarkAbstractRequest
@@ -68,6 +68,6 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp b/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp
index 20f739d7..7632f250 100644
--- a/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp
+++ b/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkrequests_p.h"
 #include "qlandmarkcategory.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkCategoryFetchRequest
@@ -170,4 +170,4 @@ void QLandmarkCategoryFetchRequest::setOffset(int offset) {
 
 #include "moc_qlandmarkcategoryfetchrequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkcategoryfetchrequest.h b/src/location/landmarks/qlandmarkcategoryfetchrequest.h
index 262e4e8b..92dbbb78 100644
--- a/src/location/landmarks/qlandmarkcategoryfetchrequest.h
+++ b/src/location/landmarks/qlandmarkcategoryfetchrequest.h
@@ -46,7 +46,7 @@
 #include "qlandmarkcategoryid.h"
 #include "qlandmarknamesort.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkCategoryFetchRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkCategoryFetchRequest : public QLandmarkAbstractRequest
@@ -73,6 +73,6 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkcategoryfilter.cpp b/src/location/landmarks/qlandmarkcategoryfilter.cpp
index 77462b01..852bd216 100644
--- a/src/location/landmarks/qlandmarkcategoryfilter.cpp
+++ b/src/location/landmarks/qlandmarkcategoryfilter.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkcategoryfilter_p.h"
 #include "qlandmarkcategoryid.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkCategoryFilter
@@ -129,4 +129,4 @@ QLandmarkCategoryFilterPrivate::QLandmarkCategoryFilterPrivate(const QLandmarkCa
 
 QLandmarkCategoryFilterPrivate::~QLandmarkCategoryFilterPrivate() {}
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkcategoryfilter.h b/src/location/landmarks/qlandmarkcategoryfilter.h
index bef2b6a3..cb9e3edb 100644
--- a/src/location/landmarks/qlandmarkcategoryfilter.h
+++ b/src/location/landmarks/qlandmarkcategoryfilter.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkCategoryId;
 
@@ -68,7 +68,7 @@ private:
     Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkCategoryFilter)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/landmarks/qlandmarkcategoryfilter_p.h b/src/location/landmarks/qlandmarkcategoryfilter_p.h
index 0cbf37ac..f3142b6f 100644
--- a/src/location/landmarks/qlandmarkcategoryfilter_p.h
+++ b/src/location/landmarks/qlandmarkcategoryfilter_p.h
@@ -55,7 +55,7 @@
 
 #include "qlandmarkfilter_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkCategoryId;
 
@@ -77,6 +77,6 @@ public:
     Q_IMPLEMENT_LANDMARKFILTER_VIRTUALCTORS(QLandmarkCategoryFilter, QLandmarkFilter::CategoryFilter)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkcategoryid.cpp b/src/location/landmarks/qlandmarkcategoryid.cpp
index 920000f3..2056aac0 100644
--- a/src/location/landmarks/qlandmarkcategoryid.cpp
+++ b/src/location/landmarks/qlandmarkcategoryid.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkcategoryid_p.h"
 #include <QString>
 
-QTM_USE_NAMESPACE
+
 
 /*!
     \class QLandmarkCategoryId
diff --git a/src/location/landmarks/qlandmarkcategoryid.h b/src/location/landmarks/qlandmarkcategoryid.h
index 962bd1b9..4dbed695 100644
--- a/src/location/landmarks/qlandmarkcategoryid.h
+++ b/src/location/landmarks/qlandmarkcategoryid.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkCategoryIdPrivate;
 class Q_LOCATION_EXPORT QLandmarkCategoryId
@@ -73,11 +73,12 @@ private:
     QSharedDataPointer<QLandmarkCategoryIdPrivate> d;
 };
 
-QTM_END_NAMESPACE
+Q_DECLARE_TYPEINFO(QLandmarkCategoryId, Q_MOVABLE_TYPE);
 
-QT_END_HEADER
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QLandmarkCategoryId)
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkCategoryId))
+QT_END_HEADER
 
-Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkCategoryId), Q_MOVABLE_TYPE);
 #endif
diff --git a/src/location/landmarks/qlandmarkcategoryid_p.h b/src/location/landmarks/qlandmarkcategoryid_p.h
index 243612c9..aa380643 100644
--- a/src/location/landmarks/qlandmarkcategoryid_p.h
+++ b/src/location/landmarks/qlandmarkcategoryid_p.h
@@ -57,7 +57,7 @@
 #include <QSharedData>
 #include <QString>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkCategoryIdPrivate : public QSharedData
 {
@@ -79,6 +79,6 @@ public:
     QString m_uri;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp b/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp
index 0bbbd191..62d9bec0 100644
--- a/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp
+++ b/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkrequests_p.h"
 #include "qlandmarkcategoryid.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkCategoryIdFetchRequest
@@ -172,7 +172,7 @@ void QLandmarkCategoryIdFetchRequest::setOffset(int offset) {
 
 #include "moc_qlandmarkcategoryidfetchrequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
 
diff --git a/src/location/landmarks/qlandmarkcategoryidfetchrequest.h b/src/location/landmarks/qlandmarkcategoryidfetchrequest.h
index ab643b4a..ec25746e 100644
--- a/src/location/landmarks/qlandmarkcategoryidfetchrequest.h
+++ b/src/location/landmarks/qlandmarkcategoryidfetchrequest.h
@@ -45,7 +45,7 @@
 #include "qlandmarkabstractrequest.h"
 #include "qlandmarknamesort.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkCategoryIdFetchRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkCategoryIdFetchRequest : public QLandmarkAbstractRequest
@@ -72,6 +72,6 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkcategoryremoverequest.cpp b/src/location/landmarks/qlandmarkcategoryremoverequest.cpp
index cf29ae13..741599a8 100644
--- a/src/location/landmarks/qlandmarkcategoryremoverequest.cpp
+++ b/src/location/landmarks/qlandmarkcategoryremoverequest.cpp
@@ -45,7 +45,7 @@
 #include <QMap>
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkCategoryRemoveRequest
@@ -167,6 +167,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkCategoryRemoveRequest::errorMap() co
 
 #include "moc_qlandmarkcategoryremoverequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
diff --git a/src/location/landmarks/qlandmarkcategoryremoverequest.h b/src/location/landmarks/qlandmarkcategoryremoverequest.h
index 84d3d686..40551e0d 100644
--- a/src/location/landmarks/qlandmarkcategoryremoverequest.h
+++ b/src/location/landmarks/qlandmarkcategoryremoverequest.h
@@ -44,7 +44,7 @@
 
 #include "qlandmarkabstractrequest.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkCategoryRemoveRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkCategoryRemoveRequest : public QLandmarkAbstractRequest
@@ -68,7 +68,7 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
 
diff --git a/src/location/landmarks/qlandmarkcategorysaverequest.cpp b/src/location/landmarks/qlandmarkcategorysaverequest.cpp
index c61f0c87..440315d5 100644
--- a/src/location/landmarks/qlandmarkcategorysaverequest.cpp
+++ b/src/location/landmarks/qlandmarkcategorysaverequest.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkrequests_p.h"
 #include "qlandmarkcategory.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkCategorySaveRequest
@@ -134,6 +134,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkCategorySaveRequest::errorMap() cons
 
 #include "moc_qlandmarkcategorysaverequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
diff --git a/src/location/landmarks/qlandmarkcategorysaverequest.h b/src/location/landmarks/qlandmarkcategorysaverequest.h
index d327c148..a07b7f01 100644
--- a/src/location/landmarks/qlandmarkcategorysaverequest.h
+++ b/src/location/landmarks/qlandmarkcategorysaverequest.h
@@ -44,7 +44,7 @@
 
 #include "qlandmarkabstractrequest.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkCategory;
 
@@ -67,7 +67,7 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
 
diff --git a/src/location/landmarks/qlandmarkexportrequest.cpp b/src/location/landmarks/qlandmarkexportrequest.cpp
index 55ab24e6..999dcd34 100644
--- a/src/location/landmarks/qlandmarkexportrequest.cpp
+++ b/src/location/landmarks/qlandmarkexportrequest.cpp
@@ -45,7 +45,7 @@
 #include <QFile>
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkExportRequest
@@ -213,6 +213,6 @@ void QLandmarkExportRequest::setLandmarkIds(const QList<QLandmarkId> &landmarkId
 
 #include "moc_qlandmarkexportrequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
diff --git a/src/location/landmarks/qlandmarkexportrequest.h b/src/location/landmarks/qlandmarkexportrequest.h
index cc2fb7c4..304b8f3b 100644
--- a/src/location/landmarks/qlandmarkexportrequest.h
+++ b/src/location/landmarks/qlandmarkexportrequest.h
@@ -43,9 +43,9 @@
 #define QLANDMARKEXPORTREQUEST_H
 
 #include "qlandmarkabstractrequest.h"
-class QIODevice;
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QIODevice;
 class QLandmarkExportRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkExportRequest : public QLandmarkAbstractRequest
 {
@@ -74,7 +74,7 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
 
diff --git a/src/location/landmarks/qlandmarkfetchbyidrequest.cpp b/src/location/landmarks/qlandmarkfetchbyidrequest.cpp
index b7f870ef..72ffb103 100644
--- a/src/location/landmarks/qlandmarkfetchbyidrequest.cpp
+++ b/src/location/landmarks/qlandmarkfetchbyidrequest.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkrequests_p.h"
 #include "qlandmark.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkFetchByIdRequest
@@ -142,4 +142,4 @@ QMap<int, QLandmarkManager::Error> QLandmarkFetchByIdRequest::errorMap() const
 
 #include "moc_qlandmarkfetchbyidrequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkfetchbyidrequest.h b/src/location/landmarks/qlandmarkfetchbyidrequest.h
index 1e700ca9..aa28ecbd 100644
--- a/src/location/landmarks/qlandmarkfetchbyidrequest.h
+++ b/src/location/landmarks/qlandmarkfetchbyidrequest.h
@@ -44,7 +44,7 @@
 
 #include "qlandmarkabstractrequest.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkFetchByIdRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkFetchByIdRequest : public QLandmarkAbstractRequest
@@ -66,6 +66,6 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkfetchrequest.cpp b/src/location/landmarks/qlandmarkfetchrequest.cpp
index 0bb5f712..9732db69 100644
--- a/src/location/landmarks/qlandmarkfetchrequest.cpp
+++ b/src/location/landmarks/qlandmarkfetchrequest.cpp
@@ -46,7 +46,7 @@
 #include "qlandmarksortorder.h"
 #include "qlandmark.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkFetchRequest
@@ -213,4 +213,4 @@ QList<QLandmark> QLandmarkFetchRequest::landmarks() const
 
 #include "moc_qlandmarkfetchrequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkfetchrequest.h b/src/location/landmarks/qlandmarkfetchrequest.h
index 64c630b2..b7b253ad 100644
--- a/src/location/landmarks/qlandmarkfetchrequest.h
+++ b/src/location/landmarks/qlandmarkfetchrequest.h
@@ -44,7 +44,7 @@
 
 #include "qlandmarkabstractrequest.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkFetchRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkFetchRequest : public QLandmarkAbstractRequest
@@ -74,6 +74,6 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkfilter.cpp b/src/location/landmarks/qlandmarkfilter.cpp
index dd98f8c3..ce2f7816 100644
--- a/src/location/landmarks/qlandmarkfilter.cpp
+++ b/src/location/landmarks/qlandmarkfilter.cpp
@@ -50,13 +50,13 @@
 #include "qgeocoordinate.h"
 
 #if !defined(Q_CC_MWERKS)
-template<> QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone()
+template<> QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone()
 {
     return d->clone();
 }
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QLandmarkFilterPrivate::QLandmarkFilterPrivate()
         : QSharedData(),
@@ -231,4 +231,4 @@ const QLandmarkFilter operator|(const QLandmarkFilter &left, const QLandmarkFilt
     return nuf;
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkfilter.h b/src/location/landmarks/qlandmarkfilter.h
index d2ab2922..94ecdf56 100644
--- a/src/location/landmarks/qlandmarkfilter.h
+++ b/src/location/landmarks/qlandmarkfilter.h
@@ -46,7 +46,7 @@
 #include <QSharedData>
 #include <Qt>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define Q_DECLARE_LANDMARKFILTER_PRIVATE(Class) \
     inline Class##Private* d_func(); \
@@ -100,9 +100,10 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QLandmarkFilter::MatchFlags);
 const Q_LOCATION_EXPORT QLandmarkFilter operator&(const QLandmarkFilter &left, const QLandmarkFilter &right);
 const Q_LOCATION_EXPORT QLandmarkFilter operator|(const QLandmarkFilter &left, const QLandmarkFilter &right);
 
-QTM_END_NAMESPACE
+Q_DECLARE_TYPEINFO(QLandmarkFilter, Q_MOVABLE_TYPE);
+
+QT_END_NAMESPACE
 
-Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkFilter), Q_MOVABLE_TYPE);
 
 
 #endif
diff --git a/src/location/landmarks/qlandmarkfilter_p.h b/src/location/landmarks/qlandmarkfilter_p.h
index ad9b8949..a47711f3 100644
--- a/src/location/landmarks/qlandmarkfilter_p.h
+++ b/src/location/landmarks/qlandmarkfilter_p.h
@@ -71,7 +71,7 @@
             d_ptr = new Class##Private(); \
     }
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QLandmarkFilterPrivate : public QSharedData
 {
 public:
@@ -91,19 +91,19 @@ public:
     QLandmarkFilter::FilterType type;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 #if defined(Q_CC_MWERKS)
 // This results in multiple symbol definition errors on all other compilers
 // but not having a definition here results in an attempt to use the unspecialized
 // clone (which fails because of the pure virtuals above)
-template<> QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone()
+template<> QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone()
 {
     return d->clone();
 }
 #else
-template<> QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone();
+template<> QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone();
 #endif
 QT_END_NAMESPACE
 
diff --git a/src/location/landmarks/qlandmarkid.cpp b/src/location/landmarks/qlandmarkid.cpp
index ebf16b43..f9efcd98 100644
--- a/src/location/landmarks/qlandmarkid.cpp
+++ b/src/location/landmarks/qlandmarkid.cpp
@@ -43,7 +43,8 @@
 #include "qlandmarkid_p.h"
 #include <QString>
 
-QTM_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkId
@@ -181,3 +182,4 @@ bool QLandmarkId::operator!=(const QLandmarkId &other) const
 }
 
 
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkid.h b/src/location/landmarks/qlandmarkid.h
index 75aba4f8..a42e3e85 100644
--- a/src/location/landmarks/qlandmarkid.h
+++ b/src/location/landmarks/qlandmarkid.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkIdPrivate;
 class Q_LOCATION_EXPORT QLandmarkId
@@ -72,12 +72,12 @@ private:
     QSharedDataPointer<QLandmarkIdPrivate> d;
 };
 
-QTM_END_NAMESPACE
+Q_DECLARE_TYPEINFO(QLandmarkId, Q_MOVABLE_TYPE);
 
-QT_END_HEADER
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkId))
+Q_DECLARE_METATYPE(QLandmarkId)
 
-Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkId), Q_MOVABLE_TYPE);
+QT_END_HEADER
 
 #endif
diff --git a/src/location/landmarks/qlandmarkid_p.h b/src/location/landmarks/qlandmarkid_p.h
index 7f5c1fff..4baa5240 100644
--- a/src/location/landmarks/qlandmarkid_p.h
+++ b/src/location/landmarks/qlandmarkid_p.h
@@ -56,7 +56,7 @@
 #include "qmobilityglobal.h"
 #include <QSharedData>
 #include <QString>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkIdPrivate : public QSharedData
 {
@@ -81,6 +81,6 @@ public:
 };
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkidfetchrequest.cpp b/src/location/landmarks/qlandmarkidfetchrequest.cpp
index 23ec0e9e..0a1040d4 100644
--- a/src/location/landmarks/qlandmarkidfetchrequest.cpp
+++ b/src/location/landmarks/qlandmarkidfetchrequest.cpp
@@ -45,7 +45,7 @@
 #include "qlandmarkrequests_p.h"
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkIdFetchRequest
@@ -214,7 +214,7 @@ QList<QLandmarkId> QLandmarkIdFetchRequest::landmarkIds() const
 
 #include "moc_qlandmarkidfetchrequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
 
diff --git a/src/location/landmarks/qlandmarkidfetchrequest.h b/src/location/landmarks/qlandmarkidfetchrequest.h
index 91f380ac..d76b66c0 100644
--- a/src/location/landmarks/qlandmarkidfetchrequest.h
+++ b/src/location/landmarks/qlandmarkidfetchrequest.h
@@ -44,7 +44,7 @@
 
 #include "qlandmarkabstractrequest.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkIdFetchRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkIdFetchRequest : public QLandmarkAbstractRequest
@@ -75,6 +75,6 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkidfilter.cpp b/src/location/landmarks/qlandmarkidfilter.cpp
index cce5f559..b93c0cc7 100644
--- a/src/location/landmarks/qlandmarkidfilter.cpp
+++ b/src/location/landmarks/qlandmarkidfilter.cpp
@@ -42,7 +42,7 @@
 #include "qlandmarkidfilter.h"
 #include "qlandmarkidfilter_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkIdFilter
@@ -158,4 +158,4 @@ QLandmarkIdFilterPrivate::QLandmarkIdFilterPrivate(const QLandmarkIdFilterPrivat
 
 QLandmarkIdFilterPrivate::~QLandmarkIdFilterPrivate() {}
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkidfilter.h b/src/location/landmarks/qlandmarkidfilter.h
index 9e1ab8fa..c7f8e978 100644
--- a/src/location/landmarks/qlandmarkidfilter.h
+++ b/src/location/landmarks/qlandmarkidfilter.h
@@ -46,7 +46,7 @@
 #include "qlandmarkfilter.h"
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkIdFilterPrivate;
 class Q_LOCATION_EXPORT QLandmarkIdFilter : public QLandmarkFilter
@@ -68,6 +68,6 @@ private:
     Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkIdFilter)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkidfilter_p.h b/src/location/landmarks/qlandmarkidfilter_p.h
index c96c2d0c..190e366a 100644
--- a/src/location/landmarks/qlandmarkidfilter_p.h
+++ b/src/location/landmarks/qlandmarkidfilter_p.h
@@ -57,7 +57,7 @@
 #include "qlandmarkid.h"
 #include "qlandmarkidfilter.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkIdFilterPrivate : public QLandmarkFilterPrivate
 {
@@ -77,6 +77,6 @@ public:
     QList<QLandmarkId> landmarkIds;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkimportrequest.cpp b/src/location/landmarks/qlandmarkimportrequest.cpp
index bf22944a..6dd51b0c 100644
--- a/src/location/landmarks/qlandmarkimportrequest.cpp
+++ b/src/location/landmarks/qlandmarkimportrequest.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkrequests_p.h"
 #include <QFile>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkImportRequest
@@ -228,6 +228,6 @@ QList<QLandmarkId> QLandmarkImportRequest::landmarkIds() const
 
 #include "moc_qlandmarkimportrequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
diff --git a/src/location/landmarks/qlandmarkimportrequest.h b/src/location/landmarks/qlandmarkimportrequest.h
index a2efd704..b4cb7058 100644
--- a/src/location/landmarks/qlandmarkimportrequest.h
+++ b/src/location/landmarks/qlandmarkimportrequest.h
@@ -43,9 +43,9 @@
 #define QLANDMARKIMPORTREQUEST_H
 
 #include "qlandmarkabstractrequest.h"
-class QIODevice;
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QIODevice;
 class QLandmarkImportRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkImportRequest : public QLandmarkAbstractRequest
 {
@@ -76,7 +76,7 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
 
diff --git a/src/location/landmarks/qlandmarkintersectionfilter.cpp b/src/location/landmarks/qlandmarkintersectionfilter.cpp
index dfd2979a..7e03790d 100644
--- a/src/location/landmarks/qlandmarkintersectionfilter.cpp
+++ b/src/location/landmarks/qlandmarkintersectionfilter.cpp
@@ -42,7 +42,7 @@
 #include "qlandmarkintersectionfilter.h"
 #include "qlandmarkintersectionfilter_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkIntersectionFilter
@@ -181,4 +181,4 @@ QLandmarkIntersectionFilterPrivate::QLandmarkIntersectionFilterPrivate(const QLa
 
 QLandmarkIntersectionFilterPrivate::~QLandmarkIntersectionFilterPrivate() {}
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkintersectionfilter.h b/src/location/landmarks/qlandmarkintersectionfilter.h
index bdb3b288..f57fb7af 100644
--- a/src/location/landmarks/qlandmarkintersectionfilter.h
+++ b/src/location/landmarks/qlandmarkintersectionfilter.h
@@ -45,7 +45,7 @@
 #include "qlandmarkfilter.h"
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkIntersectionFilterPrivate;
 class Q_LOCATION_EXPORT QLandmarkIntersectionFilter : public QLandmarkFilter
@@ -69,6 +69,6 @@ private:
     Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkIntersectionFilter)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkintersectionfilter_p.h b/src/location/landmarks/qlandmarkintersectionfilter_p.h
index 95a6690d..f6659921 100644
--- a/src/location/landmarks/qlandmarkintersectionfilter_p.h
+++ b/src/location/landmarks/qlandmarkintersectionfilter_p.h
@@ -57,7 +57,7 @@
 
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkIntersectionFilterPrivate : public QLandmarkFilterPrivate
 {
@@ -77,6 +77,6 @@ public:
     QList<QLandmarkFilter> filters;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkmanager.cpp b/src/location/landmarks/qlandmarkmanager.cpp
index ca64261e..11499a92 100644
--- a/src/location/landmarks/qlandmarkmanager.cpp
+++ b/src/location/landmarks/qlandmarkmanager.cpp
@@ -56,7 +56,8 @@
 #include "qlandmarkmanagerenginefactory.h"
 #include "qlandmarkidfilter.h"
 
-QTM_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
    \variable QLandmarkManager::Gpx
@@ -229,11 +230,11 @@ QLandmarkManager::QLandmarkManager(QObject *parent)
     QString managerName;
 
 #ifdef Q_OS_SYMBIAN
-     managerName = "com.nokia.qt.landmarks.engines.symbian";
+     managerName = QLatin1String("com.nokia.qt.landmarks.engines.symbian");
 #elif defined(Q_WS_MAEMO_6) || defined(Q_WS_MEEGO)
-     managerName = "com.nokia.qt.landmarks.engines.qsparql";
+     managerName = QLatin1String("com.nokia.qt.landmarks.engines.qsparql");
 #else
-    managerName = "com.nokia.qt.landmarks.engines.sqlite";
+    managerName = QLatin1String("com.nokia.qt.landmarks.engines.sqlite");
 #endif
 
     d->createEngine(managerName);
@@ -298,7 +299,7 @@ bool QLandmarkManager::saveLandmark(QLandmark *landmark)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->saveLandmark(landmark,
@@ -329,7 +330,7 @@ bool QLandmarkManager::saveLandmarks(QList<QLandmark> *landmarks)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->saveLandmarks(landmarks,
@@ -354,7 +355,7 @@ bool QLandmarkManager::removeLandmark(const QLandmarkId &landmarkId)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->removeLandmark(landmarkId,
@@ -379,7 +380,7 @@ bool QLandmarkManager::removeLandmark(const QLandmark &landmark)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->removeLandmark(landmark.landmarkId(),
@@ -410,7 +411,7 @@ bool QLandmarkManager::removeLandmarks(const QList<QLandmarkId> &landmarkIds)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
 
@@ -444,7 +445,7 @@ bool QLandmarkManager::removeLandmarks(const QList<QLandmark> &landmarks)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QList<QLandmarkId> landmarkIds;
@@ -489,7 +490,7 @@ bool QLandmarkManager::saveCategory(QLandmarkCategory *category)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->saveCategory(category,
@@ -513,7 +514,7 @@ bool QLandmarkManager::removeCategory(const QLandmarkCategoryId &categoryId)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->removeCategory(categoryId,
@@ -537,7 +538,7 @@ bool QLandmarkManager::removeCategory(const QLandmarkCategory &category)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->removeCategory(category.categoryId(),
@@ -558,7 +559,7 @@ QLandmarkCategory QLandmarkManager::category(const QLandmarkCategoryId &category
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QLandmarkCategory cat = d->engine->category(categoryId,
@@ -589,7 +590,7 @@ QList<QLandmarkCategory> QLandmarkManager::categories(const QList<QLandmarkCateg
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QList<QLandmarkCategory> cats = d->engine->categories(categoryIds,
@@ -617,7 +618,7 @@ QList<QLandmarkCategory> QLandmarkManager::categories(int limit, int offset, con
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QList<QLandmarkCategory> cats = d->engine->categories(limit, offset, nameSort,
@@ -647,7 +648,7 @@ QList<QLandmarkCategoryId> QLandmarkManager::categoryIds(int limit, int offset,
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QList<QLandmarkCategoryId> ids = d->engine->categoryIds(limit, offset, nameSort,
@@ -673,7 +674,7 @@ QLandmark QLandmarkManager::landmark(const QLandmarkId &landmarkId) const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QLandmark lm = d->engine->landmark(landmarkId,
@@ -702,7 +703,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QLandmarkFilter &filter, int
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QList<QLandmark> lms = d->engine->landmarks(filter,
@@ -735,7 +736,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QLandmarkFilter &filter, int
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     QList<QLandmarkSortOrder> sortOrders;
@@ -774,7 +775,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QList<QLandmarkId> &landmarkI
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     QList<QLandmark> lms = d->engine->landmarks(landmarkIds,
@@ -803,7 +804,7 @@ QList<QLandmarkId> QLandmarkManager::landmarkIds(const QLandmarkFilter &filter,
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     QList<QLandmarkId> ids = d->engine->landmarkIds(filter,
@@ -840,7 +841,7 @@ QList<QLandmarkId> QLandmarkManager::landmarkIds(const QLandmarkFilter &filter,
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     QList<QLandmarkSortOrder> sortOrders;
@@ -885,7 +886,7 @@ bool QLandmarkManager::importLandmarks(QIODevice *device, const QString &format,
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     return d->engine->importLandmarks(device,
@@ -945,7 +946,7 @@ bool QLandmarkManager::exportLandmarks(QIODevice *device, const QString &format,
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     return d->engine->exportLandmarks(device,
@@ -993,7 +994,7 @@ QStringList QLandmarkManager::supportedFormats(QLandmarkManager::TransferOperati
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     return d->engine->supportedFormats(operation, &(d->errorCode), &(d->errorString));
@@ -1052,7 +1053,7 @@ bool QLandmarkManager::isFeatureSupported(QLandmarkManager::ManagerFeature featu
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->isFeatureSupported(feature, &(d->errorCode), &(d->errorString));
@@ -1073,7 +1074,7 @@ QLandmarkManager::SupportLevel QLandmarkManager::filterSupportLevel(const QLandm
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     return d->engine->filterSupportLevel(filter, &(d->errorCode), &(d->errorString));
@@ -1092,7 +1093,7 @@ QLandmarkManager::SupportLevel QLandmarkManager::sortOrderSupportLevel(const QLa
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     return d->engine->sortOrderSupportLevel(sortOrder, &(d->errorCode), &(d->errorString));
@@ -1111,7 +1112,7 @@ bool QLandmarkManager::isReadOnly() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->isReadOnly(&(d->errorCode), &(d->errorString));
@@ -1133,7 +1134,7 @@ bool QLandmarkManager::isReadOnly(const QLandmarkId &landmarkId) const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->isReadOnly(landmarkId, &(d->errorCode), &(d->errorString));
@@ -1155,7 +1156,7 @@ bool QLandmarkManager::isReadOnly(const QLandmarkCategoryId &categoryId) const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->isReadOnly(categoryId, &(d->errorCode), &(d->errorString));
@@ -1174,7 +1175,7 @@ QStringList QLandmarkManager::searchableLandmarkAttributeKeys() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->searchableLandmarkAttributeKeys(&(d->errorCode), &(d->errorString));
@@ -1196,7 +1197,7 @@ QString QLandmarkManager::managerName() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
     return d->engine->managerName();
 }
@@ -1217,7 +1218,7 @@ QMap<QString, QString> QLandmarkManager::managerParameters() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
     return d->engine->managerParameters();
 }
@@ -1235,7 +1236,7 @@ QString QLandmarkManager::managerUri() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
     return d->engine->managerUri();
 }
@@ -1253,7 +1254,7 @@ int QLandmarkManager::managerVersion() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
     return d->engine->managerVersion();
 }
@@ -1389,14 +1390,14 @@ void QLandmarkManager::connectNotify(const char *signal)
 
     if (!d_ptr->isConnected) {
         if (d_ptr->engine) {
-            if (QLatin1String(signal) == SIGNAL(landmarksAdded(QList<QLandmarkId>))
-                || (QLatin1String(signal) == SIGNAL(landmarksChanged(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(landmarksRemoved(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(landmarksChanged(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(dataChanged()))) {
+            if (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksAdded(QList<QLandmarkId>)))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksChanged(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksRemoved(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksChanged(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(dataChanged())))) {
                 connect(d_ptr->engine,SIGNAL(landmarksAdded(QList<QLandmarkId>)),
                         this, SIGNAL(landmarksAdded(QList<QLandmarkId>)));
                 connect(d_ptr->engine,SIGNAL(landmarksChanged(QList<QLandmarkId>)),
@@ -1426,13 +1427,13 @@ void QLandmarkManager::disconnectNotify(const char *signal)
 {
     if (d_ptr->isConnected) {
         if (d_ptr->engine) {
-            if ((QLatin1String(signal) == SIGNAL(landmarksAdded(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(landmarksChanged(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(landmarksRemoved(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(dataChanged()))) {
+            if ((QLatin1String(signal) == QLatin1String(SIGNAL(landmarksAdded(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksChanged(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksRemoved(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(dataChanged())))) {
                 disconnect(d_ptr->engine,SIGNAL(landmarksAdded(QList<QLandmarkId>)),
                            this, SIGNAL(landmarksAdded(QList<QLandmarkId>)));
                 disconnect(d_ptr->engine,SIGNAL(landmarksChanged(QList<QLandmarkId>)),
@@ -1524,3 +1525,5 @@ QLandmarkManagerEngine *QLandmarkManager::engine()
 */
 
 #include "moc_qlandmarkmanager.cpp"
+
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkmanager.h b/src/location/landmarks/qlandmarkmanager.h
index 2df37b27..6668546c 100644
--- a/src/location/landmarks/qlandmarkmanager.h
+++ b/src/location/landmarks/qlandmarkmanager.h
@@ -55,10 +55,10 @@
 #include <qlatin1constant.h>
 #include <QObject>
 #include <QMap>
+
+QT_BEGIN_NAMESPACE
 class QIODevice;
 class QStringList;
-
-QTM_BEGIN_NAMESPACE
 class QLandmarkManagerPrivate;
 class QLandmarkManagerEngine;
 
@@ -215,6 +215,6 @@ private:
     QLandmarkManagerEngine *engine();
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkmanager_p.cpp b/src/location/landmarks/qlandmarkmanager_p.cpp
index 343b88da..37ce5f06 100644
--- a/src/location/landmarks/qlandmarkmanager_p.cpp
+++ b/src/location/landmarks/qlandmarkmanager_p.cpp
@@ -52,7 +52,7 @@
 
 #include "qmobilitypluginsearch.h"
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QLandmarkManagerPrivate::QLandmarkManagerPrivate()
         : engine(0),
@@ -68,7 +68,7 @@ void QLandmarkManagerPrivate::createEngine(const QString &managerName, const QMa
 
     if (!q->availableManagers().contains(managerName)) {
         errorCode = QLandmarkManager::InvalidManagerError;
-        errorString = QString("The landmark manager, %1, was not found").arg(managerName);
+        errorString = QString::fromLatin1("The landmark manager, %1, was not found").arg(managerName);
         qWarning() << errorString;
         engine = 0;
         return;
@@ -77,7 +77,7 @@ void QLandmarkManagerPrivate::createEngine(const QString &managerName, const QMa
     QList<QLandmarkManagerEngineFactory *> factories = QLandmarkManagerPrivate::factories().values(managerName);
 
     bool ok;
-    int implementationVersion = parameters.value(QTLANDMARKS_IMPLEMENTATION_VERSION_NAME).toInt(&ok);
+    int implementationVersion = parameters.value(QLatin1String(QTLANDMARKS_IMPLEMENTATION_VERSION_NAME)).toInt(&ok);
     if (!ok)
         implementationVersion = -1;
 
@@ -95,7 +95,7 @@ void QLandmarkManagerPrivate::createEngine(const QString &managerName, const QMa
     if (!engine) {
         if (errorCode == QLandmarkManager::NoError) {
             errorCode = QLandmarkManager::InvalidManagerError;
-            errorString = "The landmark manager could not return the requested engine instance";
+            errorString = QLatin1String("The landmark manager could not return the requested engine instance");
         }
     }
 }
@@ -169,3 +169,5 @@ void QLandmarkManagerPrivate::loadStaticFactories(QHash<QString, QLandmarkManage
 
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkmanager_p.h b/src/location/landmarks/qlandmarkmanager_p.h
index fbdf4042..e6feb7ab 100644
--- a/src/location/landmarks/qlandmarkmanager_p.h
+++ b/src/location/landmarks/qlandmarkmanager_p.h
@@ -61,7 +61,7 @@
 
 #define QTLANDMARKS_IMPLEMENTATION_VERSION_NAME "com.nokia.qtmobility.landmarks.implementation.version"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkManagerEngine;
 class QLandmarkManagerEngineFactory;
@@ -87,6 +87,6 @@ public:
     Q_DECLARE_PUBLIC(QLandmarkManager)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QLANDMARKMANAGER_P_H
diff --git a/src/location/landmarks/qlandmarkmanagerengine.cpp b/src/location/landmarks/qlandmarkmanagerengine.cpp
index b96dc099..bc8d4de2 100644
--- a/src/location/landmarks/qlandmarkmanagerengine.cpp
+++ b/src/location/landmarks/qlandmarkmanagerengine.cpp
@@ -78,7 +78,7 @@
 
 #include <QWeakPointer>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 bool matchString(const QString &sourceString, const QString &matchString, QLandmarkFilter::MatchFlags matchFlags )
 {
@@ -102,44 +102,44 @@ bool matchString(const QString &sourceString, const QString &matchString, QLandm
 
 QVariant getLandmarkAttribute(const QString key, const QLandmark &landmark)
 {
-    if (key == "name") {
+    if (key == QLatin1String("name")) {
         return landmark.name();
-    } else if (key == "description") {
+    } else if (key == QLatin1String("description")) {
         return landmark.description();
-    } else if (key == "countryCode") {
+    } else if (key == QLatin1String("countryCode")) {
         return landmark.address().countryCode();
-    } else if (key == "country") {
+    } else if (key == QLatin1String("country")) {
         return landmark.address().country();
-    } else if (key == "state") {
+    } else if (key == QLatin1String("state")) {
         return landmark.address().state();
-    } else if (key == "city") {
+    } else if (key == QLatin1String("city")) {
         return landmark.address().city();
-    } else if (key == "district") {
+    } else if (key == QLatin1String("district")) {
         return landmark.address().district();
-    }  else if (key == "district") {
+    }  else if (key == QLatin1String("district")) {
         return landmark.address().district();
-    } else if (key == "street") {
+    } else if (key == QLatin1String("street")) {
         return landmark.address().street();
-    } else if (key == "postcode") {
+    } else if (key == QLatin1String("postcode")) {
         return landmark.address().postcode();
-    } else if (key == "phoneNumber") {
+    } else if (key == QLatin1String("phoneNumber")) {
         return landmark.phoneNumber();
     } else {
         return QVariant(); // shouldn't be possible
     }
 }
 
-QStringList commonLandmarkKeys = QStringList() << "name"
-                                << "description"
-                                << "countryCode"
-                                << "country"
-                                << "state"
-                                << "county"
-                                << "city"
-                                << "district"
-                                << "street"
-                                << "postcode"
-                                << "phoneNumber";
+QStringList commonLandmarkKeys = QStringList() << QLatin1String("name")
+                                << QLatin1String("description")
+                                << QLatin1String("countryCode")
+                                << QLatin1String("country")
+                                << QLatin1String("state")
+                                << QLatin1String("county")
+                                << QLatin1String("city")
+                                << QLatin1String("district")
+                                << QLatin1String("street")
+                                << QLatin1String("postcode")
+                                << QLatin1String("phoneNumber");
 
 /*!
     \class QLandmarkManagerEngine
@@ -503,7 +503,7 @@ bool QLandmarkManagerEngine::importLandmarks(QIODevice* /*device*/, const QStrin
     Q_ASSERT(error);
     Q_ASSERT(errorString);
     *error = QLandmarkManager::NotSupportedError;
-    *errorString ="Not supported";
+    *errorString = QLatin1String("Not supported");
     return false;
 }
 
@@ -532,7 +532,7 @@ bool QLandmarkManagerEngine::exportLandmarks(QIODevice * /*device*/, const QStri
     Q_ASSERT(error);
     Q_ASSERT(errorString);
     *error = QLandmarkManager::NotSupportedError;
-    *errorString = "Not supported";
+    *errorString = QLatin1String("Not supported");
     return false;
 }
 
@@ -546,7 +546,7 @@ QStringList QLandmarkManagerEngine::supportedFormats(QLandmarkManager::TransferO
     Q_ASSERT(error);
     Q_ASSERT(errorString);
     *error = QLandmarkManager::NoError;
-    *errorString = "";
+    *errorString = QLatin1String("");
     return QStringList();
 }
 
@@ -1446,4 +1446,4 @@ QList<QLandmarkId> QLandmarkManagerEngine::sortLandmarks(const QList<QLandmark>&
 
 #include "moc_qlandmarkmanagerengine.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkmanagerengine.h b/src/location/landmarks/qlandmarkmanagerengine.h
index 36501cbc..fd856ccb 100644
--- a/src/location/landmarks/qlandmarkmanagerengine.h
+++ b/src/location/landmarks/qlandmarkmanagerengine.h
@@ -49,9 +49,9 @@
 #include "qlandmarkabstractrequest.h"
 
 
-class QIODevice;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
+class QIODevice;
 class QLandmarkCategory;
 class QLandmarkCategoryId;
 class QLandmark;
@@ -194,6 +194,6 @@ public:
     static QList<QLandmarkId> sortLandmarks(const QList<QLandmark>& landmarks, const QList<QLandmarkSortOrder>& sortOrders);
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkmanagerenginefactory.cpp b/src/location/landmarks/qlandmarkmanagerenginefactory.cpp
index 1bcdebe2..da183b7e 100644
--- a/src/location/landmarks/qlandmarkmanagerenginefactory.cpp
+++ b/src/location/landmarks/qlandmarkmanagerenginefactory.cpp
@@ -42,7 +42,7 @@
 #include "qlandmarkmanagerenginefactory.h"
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkManagerEngineFactory
@@ -103,6 +103,6 @@ QList<int> QLandmarkManagerEngineFactory::supportedImplementationVersions() cons
     \since 1.1
  */
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
diff --git a/src/location/landmarks/qlandmarkmanagerenginefactory.h b/src/location/landmarks/qlandmarkmanagerenginefactory.h
index 861ec78e..c8be6381 100644
--- a/src/location/landmarks/qlandmarkmanagerenginefactory.h
+++ b/src/location/landmarks/qlandmarkmanagerenginefactory.h
@@ -46,7 +46,7 @@
 #include "qlandmarkmanager.h"
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkManagerEngine;
 class Q_LOCATION_EXPORT QLandmarkManagerEngineFactory
@@ -60,7 +60,7 @@ public:
     virtual QString managerName() const = 0;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 #define QT_LANDMARKS_BACKEND_INTERFACE "com.nokia.qt.mobility.landmarks.enginefactory/1.0"
diff --git a/src/location/landmarks/qlandmarknamefilter.cpp b/src/location/landmarks/qlandmarknamefilter.cpp
index 2cb37d2d..44fce816 100644
--- a/src/location/landmarks/qlandmarknamefilter.cpp
+++ b/src/location/landmarks/qlandmarknamefilter.cpp
@@ -42,7 +42,7 @@
 #include "qlandmarknamefilter.h"
 #include "qlandmarknamefilter_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkNameFilter
@@ -140,4 +140,4 @@ QLandmarkNameFilterPrivate::QLandmarkNameFilterPrivate(const QLandmarkNameFilter
 
 QLandmarkNameFilterPrivate::~QLandmarkNameFilterPrivate() {}
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarknamefilter.h b/src/location/landmarks/qlandmarknamefilter.h
index bbe81c36..3b4e5662 100644
--- a/src/location/landmarks/qlandmarknamefilter.h
+++ b/src/location/landmarks/qlandmarknamefilter.h
@@ -47,7 +47,7 @@
 
 #include <QString>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkNameFilterPrivate;
 class Q_LOCATION_EXPORT QLandmarkNameFilter : public QLandmarkFilter
@@ -67,6 +67,6 @@ private:
     Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkNameFilter)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarknamefilter_p.h b/src/location/landmarks/qlandmarknamefilter_p.h
index 3ec8d2d8..a8ecb114 100644
--- a/src/location/landmarks/qlandmarknamefilter_p.h
+++ b/src/location/landmarks/qlandmarknamefilter_p.h
@@ -58,7 +58,7 @@
 #include "qnamespace.h"
 #include <QString>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkNameFilterPrivate : public QLandmarkFilterPrivate
 {
@@ -80,6 +80,6 @@ public:
     QLandmarkFilter::MatchFlags flags;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarknamesort.cpp b/src/location/landmarks/qlandmarknamesort.cpp
index 698c3c93..c6f57663 100644
--- a/src/location/landmarks/qlandmarknamesort.cpp
+++ b/src/location/landmarks/qlandmarknamesort.cpp
@@ -42,7 +42,7 @@
 #include "qlandmarknamesort.h"
 #include "qlandmarknamesort_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkNameSort
@@ -120,4 +120,4 @@ QLandmarkNameSortPrivate::QLandmarkNameSortPrivate(const QLandmarkNameSortPrivat
 QLandmarkNameSortPrivate::~QLandmarkNameSortPrivate() {}
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarknamesort.h b/src/location/landmarks/qlandmarknamesort.h
index 4f40c03d..55ab535a 100644
--- a/src/location/landmarks/qlandmarknamesort.h
+++ b/src/location/landmarks/qlandmarknamesort.h
@@ -46,7 +46,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkNameSortPrivate;
 class Q_LOCATION_EXPORT QLandmarkNameSort : public QLandmarkSortOrder
@@ -62,7 +62,7 @@ private:
     Q_DECLARE_LANDMARKSORTORDER_PRIVATE(QLandmarkNameSort)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/landmarks/qlandmarknamesort_p.h b/src/location/landmarks/qlandmarknamesort_p.h
index e61b6a55..e3bed470 100644
--- a/src/location/landmarks/qlandmarknamesort_p.h
+++ b/src/location/landmarks/qlandmarknamesort_p.h
@@ -55,7 +55,7 @@
 
 #include "qlandmarksortorder_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkNameSortPrivate : public QLandmarkSortOrderPrivate
 {
@@ -76,6 +76,6 @@ public:
     Qt::CaseSensitivity sensitivity;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkproximityfilter.cpp b/src/location/landmarks/qlandmarkproximityfilter.cpp
index bb64c141..d6672078 100644
--- a/src/location/landmarks/qlandmarkproximityfilter.cpp
+++ b/src/location/landmarks/qlandmarkproximityfilter.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkproximityfilter_p.h"
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkProximityFilter
@@ -177,4 +177,4 @@ QLandmarkProximityFilterPrivate::QLandmarkProximityFilterPrivate(const QLandmark
 
 QLandmarkProximityFilterPrivate::~QLandmarkProximityFilterPrivate() {}
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkproximityfilter.h b/src/location/landmarks/qlandmarkproximityfilter.h
index 0f480730..f937df1b 100644
--- a/src/location/landmarks/qlandmarkproximityfilter.h
+++ b/src/location/landmarks/qlandmarkproximityfilter.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkProximityFilterPrivate;
 class Q_LOCATION_EXPORT QLandmarkProximityFilter : public QLandmarkFilter
@@ -72,7 +72,7 @@ private:
     Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkProximityFilter)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/landmarks/qlandmarkproximityfilter_p.h b/src/location/landmarks/qlandmarkproximityfilter_p.h
index 8024b899..6c1f1586 100644
--- a/src/location/landmarks/qlandmarkproximityfilter_p.h
+++ b/src/location/landmarks/qlandmarkproximityfilter_p.h
@@ -56,7 +56,7 @@
 #include "qlandmarkfilter_p.h"
 #include "qlandmarkproximityfilter.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 
@@ -79,6 +79,6 @@ public:
     QGeoBoundingCircle circle;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarkremoverequest.cpp b/src/location/landmarks/qlandmarkremoverequest.cpp
index 57a40bf3..8606c211 100644
--- a/src/location/landmarks/qlandmarkremoverequest.cpp
+++ b/src/location/landmarks/qlandmarkremoverequest.cpp
@@ -43,7 +43,7 @@
 #include "qlandmarkrequests_p.h"
 #include <QMap>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkRemoveRequest
@@ -164,6 +164,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkRemoveRequest::errorMap() const
 
 #include "moc_qlandmarkremoverequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
diff --git a/src/location/landmarks/qlandmarkremoverequest.h b/src/location/landmarks/qlandmarkremoverequest.h
index f24ae8b5..c31a3915 100644
--- a/src/location/landmarks/qlandmarkremoverequest.h
+++ b/src/location/landmarks/qlandmarkremoverequest.h
@@ -44,7 +44,7 @@
 
 #include "qlandmarkabstractrequest.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkRemoveRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkRemoveRequest : public QLandmarkAbstractRequest
@@ -68,7 +68,7 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
 
diff --git a/src/location/landmarks/qlandmarkrequests_p.h b/src/location/landmarks/qlandmarkrequests_p.h
index f2022953..354cbd4d 100644
--- a/src/location/landmarks/qlandmarkrequests_p.h
+++ b/src/location/landmarks/qlandmarkrequests_p.h
@@ -59,7 +59,7 @@
 #include "qlandmarkcategoryfetchrequest.h"
 #include "qlandmarknamesort.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkIdFetchRequestPrivate : public QLandmarkAbstractRequestPrivate
 {
@@ -252,6 +252,6 @@ public:
     QList<QLandmarkId> landmarkIds;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/landmarks/qlandmarksaverequest.cpp b/src/location/landmarks/qlandmarksaverequest.cpp
index 115da613..0e61da46 100644
--- a/src/location/landmarks/qlandmarksaverequest.cpp
+++ b/src/location/landmarks/qlandmarksaverequest.cpp
@@ -44,7 +44,7 @@
 #include "qlandmark.h"
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkSaveRequest
@@ -136,6 +136,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkSaveRequest::errorMap() const
 
 #include "moc_qlandmarksaverequest.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
diff --git a/src/location/landmarks/qlandmarksaverequest.h b/src/location/landmarks/qlandmarksaverequest.h
index 73f45d8a..556590c4 100644
--- a/src/location/landmarks/qlandmarksaverequest.h
+++ b/src/location/landmarks/qlandmarksaverequest.h
@@ -44,7 +44,7 @@
 
 #include "qlandmarkabstractrequest.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkSaveRequestPrivate;
 class Q_LOCATION_EXPORT QLandmarkSaveRequest : public QLandmarkAbstractRequest
@@ -65,7 +65,7 @@ private:
     friend class QLandmarkManagerEngine;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
 
diff --git a/src/location/landmarks/qlandmarksortorder.cpp b/src/location/landmarks/qlandmarksortorder.cpp
index 2b7d2704..ac297875 100644
--- a/src/location/landmarks/qlandmarksortorder.cpp
+++ b/src/location/landmarks/qlandmarksortorder.cpp
@@ -44,13 +44,13 @@
 #include "qlandmarkid.h"
 
 #if !defined(Q_CC_MWERKS)
-template<> QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone()
+template<> QT_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone()
 {
     return d->clone();
 }
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkSortOrder
@@ -196,4 +196,4 @@ QLandmarkSortOrderPrivate::~QLandmarkSortOrderPrivate()
 {
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarksortorder.h b/src/location/landmarks/qlandmarksortorder.h
index 0e26f022..48bd6f83 100644
--- a/src/location/landmarks/qlandmarksortorder.h
+++ b/src/location/landmarks/qlandmarksortorder.h
@@ -50,7 +50,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define Q_DECLARE_LANDMARKSORTORDER_PRIVATE(Class) \
     inline Class##Private* d_func(); \
@@ -87,7 +87,7 @@ protected:
     QSharedDataPointer<QLandmarkSortOrderPrivate> d_ptr;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/landmarks/qlandmarksortorder_p.h b/src/location/landmarks/qlandmarksortorder_p.h
index 2b441b6e..68dd8bd7 100644
--- a/src/location/landmarks/qlandmarksortorder_p.h
+++ b/src/location/landmarks/qlandmarksortorder_p.h
@@ -56,7 +56,7 @@
 #include "qlandmarksortorder.h"
 #include <QSharedData>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define Q_IMPLEMENT_LANDMARKSORTORDER_PRIVATE(Class) \
     Class##Private* Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \
@@ -93,18 +93,17 @@ public:
     Qt::SortOrder order;
 };
 
-QTM_END_NAMESPACE
 
 #if defined(Q_CC_MWERKS)
 // This results in multiple symbol definition errors on all other compilers
 // but not having a definition here results in an attempt to use the unspecialized
 // clone (which fails because of the pure virtuals above)
-template<> QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone()
+template<> QLandmarkSortOrderPrivate *QSharedDataPointer<QLandmarkSortOrderPrivate>::clone()
 {
     return d->clone();
 }
 #else
-template<> QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone();
+template<> QLandmarkSortOrderPrivate *QSharedDataPointer<QLandmarkSortOrderPrivate>::clone();
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkunionfilter.cpp b/src/location/landmarks/qlandmarkunionfilter.cpp
index 272e4545..63deb357 100644
--- a/src/location/landmarks/qlandmarkunionfilter.cpp
+++ b/src/location/landmarks/qlandmarkunionfilter.cpp
@@ -42,7 +42,7 @@
 #include "qlandmarkunionfilter.h"
 #include "qlandmarkunionfilter_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QLandmarkUnionFilter
@@ -183,4 +183,4 @@ QLandmarkUnionFilterPrivate::QLandmarkUnionFilterPrivate(const QLandmarkUnionFil
 
 QLandmarkUnionFilterPrivate::~QLandmarkUnionFilterPrivate() {}
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/landmarks/qlandmarkunionfilter.h b/src/location/landmarks/qlandmarkunionfilter.h
index 3ecf29cd..a0e17753 100644
--- a/src/location/landmarks/qlandmarkunionfilter.h
+++ b/src/location/landmarks/qlandmarkunionfilter.h
@@ -45,7 +45,7 @@
 #include "qlandmarkfilter.h"
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkUnionFilterPrivate;
 class Q_LOCATION_EXPORT QLandmarkUnionFilter : public QLandmarkFilter
@@ -69,7 +69,7 @@ private:
     Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkUnionFilter)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
 
diff --git a/src/location/landmarks/qlandmarkunionfilter_p.h b/src/location/landmarks/qlandmarkunionfilter_p.h
index e9419d56..32b8705d 100644
--- a/src/location/landmarks/qlandmarkunionfilter_p.h
+++ b/src/location/landmarks/qlandmarkunionfilter_p.h
@@ -57,7 +57,7 @@
 
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLandmarkUnionFilterPrivate : public QLandmarkFilterPrivate
 {
@@ -78,6 +78,6 @@ public:
     QList<QLandmarkFilter> filters;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/location.pro b/src/location/location.pro
index 20fea7d4..db7749e9 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -10,6 +10,8 @@ QT = core gui network
 
 DEFINES += QT_BUILD_LOCATION_LIB QT_MAKEDLL
 
+INCLUDEPATH += $$QT.location.private_includes/QtLocation
+
 load(qt_module_config)
 
 HEADERS += qtlocationversion.h
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..6f7a2be3 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
@@ -785,9 +785,9 @@ QGeoMapDataPrivate::QGeoMapDataPrivate(QGeoMapData *parent, QGeoMappingManagerEn
       containerObject(0),
       zoomLevel(-1.0),
       shiftSinceLastInval(0, 0),
-      windowSize(0, 0),
       bearing(0.0),
       tilt(0.0),
+      windowSize(0, 0),
       blockPropertyChangeSignals(false),
       q_ptr(parent)
 {}
@@ -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..5722dda2 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:
@@ -285,12 +285,12 @@ bool QGeoMapObjectEngine::exactMetersToSeconds(const QGeoCoordinate &origin,
                                               QGraphicsItem *item,
                                               QList<QPolygonF> &polys)
 {
-    QString projStr = "+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84";
+    QString projStr = QLatin1String("+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84");
     projStr = projStr.arg(origin.latitude(), 0, 'f', 12)
                      .arg(origin.longitude(), 0, 'f', 12);
 
     ProjCoordinateSystem localSys(projStr, false);
-    ProjCoordinateSystem wgs84("+proj=latlon +ellps=WGS84");
+    ProjCoordinateSystem wgs84(QLatin1String("+proj=latlon +ellps=WGS84"));
 
     QTransform west;
     west.translate(360.0 * 3600.0, 0.0);
@@ -491,12 +491,12 @@ void QGeoMapObjectEngine::bilinearMetersToSeconds(const QGeoCoordinate &origin,
                                                  QPolygonF &local,
                                                  QTransform &latLon)
 {
-    QString projStr = "+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84";
+    QString projStr = QLatin1String("+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84");
     projStr = projStr.arg(origin.latitude(), 0, 'f', 12)
                      .arg(origin.longitude(), 0, 'f', 12);
 
     ProjCoordinateSystem localSys(projStr, false);
-    ProjCoordinateSystem wgs84("+proj=latlon +ellps=WGS84");
+    ProjCoordinateSystem wgs84(QLatin1String("+proj=latlon +ellps=WGS84"));
 
     ProjPolygon p(local, localSys);
     if (!p.convert(wgs84)) {
@@ -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..a741c6f4 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
@@ -255,7 +255,7 @@ void QGeoRouteReply::abort()
 
 QGeoRouteReplyPrivate::QGeoRouteReplyPrivate(const QGeoRouteRequest &request)
     : error(QGeoRouteReply::NoError),
-      errorString(""),
+      errorString(QLatin1String("")),
       isFinished(false),
       request(request) {}
 
@@ -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..0cf1d1e2 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
@@ -207,7 +207,7 @@ QGeoRouteReply* QGeoRoutingManagerEngine::updateRoute(const QGeoRoute &route, co
     Q_UNUSED(route)
     Q_UNUSED(position)
     return new QGeoRouteReply(QGeoRouteReply::UnsupportedOptionError,
-                              "The updating of routes is not supported by this service provider.", this);
+                              QLatin1String("The updating of routes is not supported by this service provider."), this);
 }
 
 /*!
@@ -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..fedf83d8 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
@@ -196,7 +196,7 @@ QGeoSearchReply* QGeoSearchManagerEngine::geocode(const QGeoAddress &address,
     Q_UNUSED(address)
     Q_UNUSED(bounds)
     return new QGeoSearchReply(QGeoSearchReply::UnsupportedOptionError,
-                               "Geocoding is not supported by this service provider.", this);
+                               QLatin1String("Geocoding is not supported by this service provider."), this);
 }
 
 /*!
@@ -241,7 +241,7 @@ QGeoSearchReply* QGeoSearchManagerEngine::reverseGeocode(const QGeoCoordinate &c
     Q_UNUSED(coordinate)
     Q_UNUSED(bounds)
     return new QGeoSearchReply(QGeoSearchReply::UnsupportedOptionError,
-                               "Reverse geocoding is not supported by this service provider.", this);
+                               QLatin1String("Reverse geocoding is not supported by this service provider."), this);
 }
 
 /*!
@@ -312,7 +312,7 @@ QGeoSearchReply* QGeoSearchManagerEngine::search(const QString &searchString,
     Q_UNUSED(bounds)
 
     return new QGeoSearchReply(QGeoSearchReply::UnsupportedOptionError,
-                               "Searching is not supported by this service provider.", this);
+                               QLatin1String("Searching is not supported by this service provider."), this);
 }
 
 /*!
@@ -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..1dbf78ca 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
 
@@ -322,7 +322,7 @@ void QGeoSearchReply::setOffset(int offset)
 
 QGeoSearchReplyPrivate::QGeoSearchReplyPrivate()
     : error(QGeoSearchReply::NoError),
-      errorString(""),
+      errorString(QLatin1String("")),
       isFinished(false),
       viewport(0),
       limit(-1),
@@ -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..fd175c22 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
@@ -182,7 +182,7 @@ QGeoSearchManager* QGeoServiceProvider::searchManager() const
             d_ptr->searchManager = new QGeoSearchManager(engine);
         } else {
             d_ptr->searchError = QGeoServiceProvider::NotSupportedError;
-            d_ptr->searchErrorString = "The service provider does not support searchManager().";
+            d_ptr->searchErrorString = QLatin1String("The service provider does not support searchManager().");
         }
 
         if (d_ptr->searchError != QGeoServiceProvider::NoError) {
@@ -229,7 +229,7 @@ QGeoMappingManager* QGeoServiceProvider::mappingManager() const
             d_ptr->mappingManager = new QGeoMappingManager(engine);
         } else {
             d_ptr->mappingError = QGeoServiceProvider::NotSupportedError;
-            d_ptr->mappingErrorString = "The service provider does not support mappingManager().";
+            d_ptr->mappingErrorString = QLatin1String("The service provider does not support mappingManager().");
         }
 
         if (d_ptr->mappingError != QGeoServiceProvider::NoError) {
@@ -276,7 +276,7 @@ QGeoRoutingManager* QGeoServiceProvider::routingManager() const
             d_ptr->routingManager = new QGeoRoutingManager(engine);
         } else {
             d_ptr->routingError = QGeoServiceProvider::NotSupportedError;
-            d_ptr->routingErrorString = "The service provider does not support routingManager().";
+            d_ptr->routingErrorString = QLatin1String("The service provider does not support routingManager().");
         }
 
         if (d_ptr->routingError != QGeoServiceProvider::NoError) {
@@ -340,7 +340,7 @@ void QGeoServiceProviderPrivate::loadPlugin(const QString &providerName, const Q
 
     if (!QGeoServiceProviderPrivate::plugins().keys().contains(providerName)) {
         error = QGeoServiceProvider::NotSupportedError;
-        errorString = QString("The geoservices provider %1 is not supported.").arg(providerName);
+        errorString = QString(QLatin1String("The geoservices provider %1 is not supported.")).arg(providerName);
         factory = 0;
         return;
     }
@@ -348,7 +348,7 @@ void QGeoServiceProviderPrivate::loadPlugin(const QString &providerName, const Q
     factory = 0;
 
     error = QGeoServiceProvider::NoError;
-    errorString = "";
+    errorString = QLatin1String("");
 
     QList<QGeoServiceProviderFactory*> candidates = QGeoServiceProviderPrivate::plugins().values(providerName);
 
@@ -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..207242f1 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
@@ -1000,8 +1001,8 @@ QGeoTiledMapDataPrivate::QGeoTiledMapDataPrivate(QGeoTiledMapData *parent, QGeoM
     : QGeoMapDataPrivate(parent, engine),
       oe(new QGeoMapObjectEngine(parent, this)),
       zoomFactor(0),
-      spherical("+proj=latlon +ellps=sphere"),
-      wgs84("+proj=latlon +ellps=WGS84") {}
+      spherical(QLatin1String("+proj=latlon +ellps=sphere")),
+      wgs84(QLatin1String("+proj=latlon +ellps=WGS84")) {}
 
 QGeoTiledMapDataPrivate::~QGeoTiledMapDataPrivate()
 {
@@ -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..6b19d571 100644
--- a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp
@@ -52,13 +52,13 @@
 
 #include <QDebug>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoTiledMapObjectInfo::QGeoTiledMapObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoMapObjectInfo(mapData, mapObject),
-      graphicsItem(0),
       inited(false),
-      updateAfterInit(false)
+      updateAfterInit(false),
+      graphicsItem(0)
 {
     tiledMapData = mapData;
     tiledMapDataPrivate = static_cast<QGeoTiledMapDataPrivate*>(mapData->d_ptr);
@@ -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..622db385 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
 
@@ -311,7 +311,7 @@ void QGeoTiledMapReply::abort()
 
 QGeoTiledMapReplyPrivate::QGeoTiledMapReplyPrivate(const QGeoTiledMapRequest &request)
     : error(QGeoTiledMapReply::NoError),
-      errorString(""),
+      errorString(QLatin1String("")),
       isFinished(false),
       isCached(false),
       request(request) {}
@@ -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
 
diff --git a/src/location/notificationcallback_s60_p.h b/src/location/notificationcallback_s60_p.h
index d95c5008..9936d10e 100644
--- a/src/location/notificationcallback_s60_p.h
+++ b/src/location/notificationcallback_s60_p.h
@@ -58,7 +58,7 @@
 #include <lbs.h>
 #include <lbscommon.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class INotificationCallback
 {
@@ -69,6 +69,6 @@ public:
     virtual void updatePosition(HPositionGenericInfo  *mPosInfo, int error) = 0 ;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // NOTIFICATIONCALLBACK_H
diff --git a/src/location/notificationmonitorcallback_s60_p.h b/src/location/notificationmonitorcallback_s60_p.h
index a842797b..42dc8b59 100644
--- a/src/location/notificationmonitorcallback_s60_p.h
+++ b/src/location/notificationmonitorcallback_s60_p.h
@@ -58,7 +58,7 @@
 #include <e32base.h>    // For CActive, link against: euser.lib
 #include <lbs.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class INotificationMonitorCallback
 {
@@ -68,6 +68,6 @@ public:
 
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif /* NOTIFICATIONMONITORCALLBACK_H_ */
diff --git a/src/location/notificationsatellitecallback_s60_p.h b/src/location/notificationsatellitecallback_s60_p.h
index 9c76459e..fddd2ba1 100644
--- a/src/location/notificationsatellitecallback_s60_p.h
+++ b/src/location/notificationsatellitecallback_s60_p.h
@@ -59,7 +59,7 @@
 #include <lbscommon.h>
 #include <lbssatellite.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class INotificationSatelliteCallback
 {
@@ -70,6 +70,6 @@ public:
     virtual void updatePosition(TPositionSatelliteInfo  &aSatInfo, int error, bool isStartUpdate) = 0 ;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif /* NOTIFICATIONSATELLITECALLBACK_H_ */
diff --git a/src/location/projwrapper_p.cpp b/src/location/projwrapper_p.cpp
index 1c615e21..463cc735 100644
--- a/src/location/projwrapper_p.cpp
+++ b/src/location/projwrapper_p.cpp
@@ -47,7 +47,7 @@
 #include <QPointF>
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class ProjCoordinateSystemPrivate : public QSharedData
 {
@@ -264,4 +264,4 @@ QPolygonF ProjPolygon::toPolygonF(double scale) const
     return poly;
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/projwrapper_p.h b/src/location/projwrapper_p.h
index 395f3f5f..e0a7040a 100644
--- a/src/location/projwrapper_p.h
+++ b/src/location/projwrapper_p.h
@@ -60,7 +60,7 @@
 #include <QList>
 #include <QPolygonF>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class ProjCoordinate;
 class QGeoCoordinate;
@@ -69,7 +69,7 @@ class ProjCoordinateSystemPrivate;
 class ProjCoordinateSystem
 {
 public:
-    ProjCoordinateSystem(const QString &projection = QString("+proj=latlon +ellps=WGS84"), bool latLon=true);
+    ProjCoordinateSystem(const QString &projection = QString::fromLatin1("+proj=latlon +ellps=WGS84"), bool latLon=true);
     ProjCoordinateSystem(const ProjCoordinateSystem &other);
     ~ProjCoordinateSystem();
 
@@ -124,6 +124,6 @@ private:
     ProjPolygonPrivate *d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // PROJWRAPPER_P_H
diff --git a/src/location/qgeoaddress.cpp b/src/location/qgeoaddress.cpp
index 3d747c4b..4c73815c 100644
--- a/src/location/qgeoaddress.cpp
+++ b/src/location/qgeoaddress.cpp
@@ -47,7 +47,7 @@
 #include <QDebug>
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoAddressPrivate::QGeoAddressPrivate()
         : QSharedData()
@@ -340,5 +340,5 @@ void QGeoAddress::clear()
     d->sPostCode.clear();
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qgeoaddress.h b/src/location/qgeoaddress.h
index 06d411bb..2e542fca 100644
--- a/src/location/qgeoaddress.h
+++ b/src/location/qgeoaddress.h
@@ -45,10 +45,10 @@
 #include "qmobilityglobal.h"
 #include <QSharedDataPointer>
 
-class QString;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QString;
 class QGeoAddressPrivate;
 class Q_LOCATION_EXPORT QGeoAddress
 {
@@ -94,6 +94,6 @@ private:
     QSharedDataPointer<QGeoAddressPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/qgeoaddress_p.h b/src/location/qgeoaddress_p.h
index c6a0c63a..ca656de9 100644
--- a/src/location/qgeoaddress_p.h
+++ b/src/location/qgeoaddress_p.h
@@ -58,7 +58,7 @@
 
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoAddressPrivate : public QSharedData
 {
@@ -77,6 +77,6 @@ public:
     QString sPostCode; //!< post code field
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/qgeoareamonitor.cpp b/src/location/qgeoareamonitor.cpp
index 8c373807..cac668b9 100644
--- a/src/location/qgeoareamonitor.cpp
+++ b/src/location/qgeoareamonitor.cpp
@@ -90,7 +90,7 @@
     \endcode
 */
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoAreaMonitorPrivate
 {
@@ -216,4 +216,4 @@ QGeoAreaMonitor *QGeoAreaMonitor::createDefaultMonitor(QObject *parent)
     \since 1.0
 */
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h
index 7eb00c84..98bcf486 100644
--- a/src/location/qgeoareamonitor.h
+++ b/src/location/qgeoareamonitor.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoPositionInfo;
 class QGeoAreaMonitorPrivate;
@@ -80,7 +80,7 @@ private:
 };
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeoareamonitor_polling.cpp b/src/location/qgeoareamonitor_polling.cpp
index bea552c8..e3c871ec 100644
--- a/src/location/qgeoareamonitor_polling.cpp
+++ b/src/location/qgeoareamonitor_polling.cpp
@@ -42,7 +42,7 @@
 #include "qgeoareamonitor_polling_p.h"
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define UPDATE_INTERVAL_5S  5000
 
@@ -120,4 +120,4 @@ void QGeoAreaMonitorPolling::positionUpdated(const QGeoPositionInfo &info)
 }
 
 #include "moc_qgeoareamonitor_polling_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeoareamonitor_polling_p.h b/src/location/qgeoareamonitor_polling_p.h
index d0e1fb2f..2ac729d0 100644
--- a/src/location/qgeoareamonitor_polling_p.h
+++ b/src/location/qgeoareamonitor_polling_p.h
@@ -56,7 +56,7 @@
 #include "qgeoareamonitor.h"
 #include "qgeopositioninfosource.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /**
  *  QGeoAreaMonitorPolling
@@ -87,5 +87,5 @@ private:
     void checkStartStop();
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 #endif // QGEOAREAMONITORPOLLING_H
diff --git a/src/location/qgeoareamonitor_s60.cpp b/src/location/qgeoareamonitor_s60.cpp
index 76095a5a..e5cbcccf 100644
--- a/src/location/qgeoareamonitor_s60.cpp
+++ b/src/location/qgeoareamonitor_s60.cpp
@@ -45,7 +45,7 @@
 #include "qmlbackendmonitorinfo_s60_p.h"
 #include "qmlbackendmonitorcreatetriggerao_s60_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 TInt QGeoAreaMonitorS60::refCount = 0;
 
@@ -285,5 +285,5 @@ void QGeoAreaMonitorS60::disconnectNotify(const char* signal)
     }
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qgeoareamonitor_s60_p.h b/src/location/qgeoareamonitor_s60_p.h
index 15a1de34..7cc61ac1 100644
--- a/src/location/qgeoareamonitor_s60_p.h
+++ b/src/location/qgeoareamonitor_s60_p.h
@@ -64,7 +64,7 @@
 #include <lbttriggerconditionarea.h>
 #include <lbtgeocircle.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /**
  *  QGeoAreaMonitorS60
@@ -114,6 +114,6 @@ private:
     static TInt refCount;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif /* QGEOAREAMONITORS60_H_ */
diff --git a/src/location/qgeoboundingarea.cpp b/src/location/qgeoboundingarea.cpp
index 8caf5156..252f1095 100644
--- a/src/location/qgeoboundingarea.cpp
+++ b/src/location/qgeoboundingarea.cpp
@@ -41,7 +41,7 @@
 
 #include "qgeoboundingarea.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoBoundingArea
@@ -110,4 +110,4 @@ area.
 \since 1.1
 */
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeoboundingarea.h b/src/location/qgeoboundingarea.h
index ff016f96..652acf19 100644
--- a/src/location/qgeoboundingarea.h
+++ b/src/location/qgeoboundingarea.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 
@@ -69,7 +69,7 @@ public:
     virtual bool contains(const QGeoCoordinate &coordinate) const = 0;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeoboundingbox.cpp b/src/location/qgeoboundingbox.cpp
index 36406d1f..637a0bf8 100644
--- a/src/location/qgeoboundingbox.cpp
+++ b/src/location/qgeoboundingbox.cpp
@@ -45,7 +45,7 @@
 #include "qgeocoordinate.h"
 #include "qnumeric.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoBoundingBox
@@ -860,5 +860,5 @@ bool QGeoBoundingBoxPrivate::operator== (const QGeoBoundingBoxPrivate &other) co
     return ((topLeft == other.topLeft) && (bottomRight == other.bottomRight));
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qgeoboundingbox.h b/src/location/qgeoboundingbox.h
index 941010af..fc1547df 100644
--- a/src/location/qgeoboundingbox.h
+++ b/src/location/qgeoboundingbox.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoBoundingBoxPrivate;
@@ -114,7 +114,7 @@ inline QGeoBoundingBox QGeoBoundingBox::operator | (const QGeoBoundingBox &bound
     return united(boundingBox);
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeoboundingbox_p.h b/src/location/qgeoboundingbox_p.h
index 154abdb2..7c1553b5 100644
--- a/src/location/qgeoboundingbox_p.h
+++ b/src/location/qgeoboundingbox_p.h
@@ -57,7 +57,7 @@
 
 #include <QSharedData>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoBoundingBoxPrivate : public QSharedData
 {
@@ -75,6 +75,6 @@ public:
     QGeoCoordinate bottomRight;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/qgeoboundingcircle.cpp b/src/location/qgeoboundingcircle.cpp
index 686137e8..ec5d158c 100644
--- a/src/location/qgeoboundingcircle.cpp
+++ b/src/location/qgeoboundingcircle.cpp
@@ -47,7 +47,7 @@
 
 #include <QDebug>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoBoundingCircle
@@ -305,5 +305,5 @@ bool QGeoBoundingCirclePrivate::operator== (const QGeoBoundingCirclePrivate &oth
     return ((center == other.center) && (radius == other.radius));
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qgeoboundingcircle.h b/src/location/qgeoboundingcircle.h
index a1fcaa1b..4eb57151 100644
--- a/src/location/qgeoboundingcircle.h
+++ b/src/location/qgeoboundingcircle.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
 class QGeoBoundingCirclePrivate;
@@ -86,7 +86,7 @@ private:
     QSharedDataPointer<QGeoBoundingCirclePrivate> d_ptr;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeoboundingcircle_p.h b/src/location/qgeoboundingcircle_p.h
index 13fb235e..826a5601 100644
--- a/src/location/qgeoboundingcircle_p.h
+++ b/src/location/qgeoboundingcircle_p.h
@@ -57,7 +57,7 @@
 
 #include <QSharedData>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoBoundingCirclePrivate : public QSharedData
 {
@@ -75,6 +75,6 @@ public:
     qreal radius;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/qgeocoordinate.cpp b/src/location/qgeocoordinate.cpp
index 0c030c99..fcf9a39d 100644
--- a/src/location/qgeocoordinate.cpp
+++ b/src/location/qgeocoordinate.cpp
@@ -56,7 +56,7 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 static const double qgeocoordinate_EARTH_MEAN_RADIUS = 6371.0072;
 
@@ -521,11 +521,11 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const
         case DegreesMinutesWithHemisphere: {
             double latMin = (absLat - int(absLat)) * 60;
             double lngMin = (absLng - int(absLng)) * 60;
-            latStr = QString("%1%2 %3'")
+            latStr = QString::fromLatin1("%1%2 %3'")
                      .arg(QString::number(int(absLat)))
                      .arg(symbol)
                      .arg(QString::number(latMin, 'f', 3));
-            longStr = QString("%1%2 %3'")
+            longStr = QString::fromLatin1("%1%2 %3'")
                       .arg(QString::number(int(absLng)))
                       .arg(symbol)
                       .arg(QString::number(lngMin, 'f', 3));
@@ -538,12 +538,12 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const
             double latSec = (latMin - int(latMin)) * 60;
             double lngSec = (lngMin - int(lngMin)) * 60;
 
-            latStr = QString("%1%2 %3' %4\"")
+            latStr = QString::fromLatin1("%1%2 %3' %4\"")
                      .arg(QString::number(int(absLat)))
                      .arg(symbol)
                      .arg(QString::number(int(latMin)))
                      .arg(QString::number(latSec, 'f', 1));
-            longStr = QString("%1%2 %3' %4\"")
+            longStr = QString::fromLatin1("%1%2 %3' %4\"")
                       .arg(QString::number(int(absLng)))
                       .arg(symbol)
                       .arg(QString::number(int(lngMin)))
@@ -558,29 +558,29 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const
         case DegreesMinutes:
         case DegreesMinutesSeconds: {
             if (d->lat < 0)
-                latStr.insert(0, "-");
+                latStr.insert(0, QLatin1String("-"));
             if (d->lng < 0)
-                longStr.insert(0, "-");
+                longStr.insert(0, QLatin1String("-"));
             break;
         }
         case DegreesWithHemisphere:
         case DegreesMinutesWithHemisphere:
         case DegreesMinutesSecondsWithHemisphere: {
             if (d->lat < 0)
-                latStr.append(" S");
+                latStr.append(QString::fromLatin1(" S"));
             else if (d->lat > 0)
-                latStr.append(" N");
+                latStr.append(QString::fromLatin1(" N"));
             if (d->lng < 0)
-                longStr.append(" W");
+                longStr.append(QString::fromLatin1(" W"));
             else if (d->lng > 0)
-                longStr.append(" E");
+                longStr.append(QString::fromLatin1(" E"));
             break;
         }
     }
 
     if (qIsNaN(d->alt))
-        return QString("%1, %2").arg(latStr, longStr);
-    return QString("%1, %2, %3m").arg(latStr, longStr, QString::number(d->alt));
+        return QString::fromLatin1("%1, %2").arg(latStr, longStr);
+    return QString::fromLatin1("%1, %2, %3m").arg(latStr, longStr, QString::number(d->alt));
 }
 
 #ifndef QT_NO_DEBUG_STREAM
@@ -654,4 +654,4 @@ QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate)
 }
 #endif
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h
index 67848cb5..ac530e2e 100644
--- a/src/location/qgeocoordinate.h
+++ b/src/location/qgeocoordinate.h
@@ -45,14 +45,11 @@
 
 #include <QString>
 
+QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
+
 class QDebug;
 class QDataStream;
-QT_END_NAMESPACE
-
-QT_BEGIN_HEADER
-
-QTM_BEGIN_NAMESPACE
 
 class QGeoCoordinatePrivate;
 class Q_LOCATION_EXPORT QGeoCoordinate
@@ -120,7 +117,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoCoordin
 Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate);
 #endif
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeocoordinate_p.h b/src/location/qgeocoordinate_p.h
index 70baf777..7a859c82 100644
--- a/src/location/qgeocoordinate_p.h
+++ b/src/location/qgeocoordinate_p.h
@@ -56,7 +56,7 @@
 #include "qmobilityglobal.h"
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoCoordinatePrivate
 {
@@ -72,6 +72,6 @@ public:
                                      double *lon, double *lat);
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QGEOCOORDINATE_P_H
diff --git a/src/location/qgeoplace.cpp b/src/location/qgeoplace.cpp
index 63b285b2..d58fbd05 100644
--- a/src/location/qgeoplace.cpp
+++ b/src/location/qgeoplace.cpp
@@ -48,13 +48,13 @@
 #endif
 
 #if !defined(Q_CC_MWERKS)
-template<> QTM_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone()
+template<> QT_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone()
 {
     return d->clone();
 }
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoPlace
@@ -276,5 +276,5 @@ bool QGeoPlacePrivate::operator== (const QGeoPlacePrivate &other) const
             && (address == other.address));
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qgeoplace.h b/src/location/qgeoplace.h
index 5ebc6f1a..a2cafd9e 100644
--- a/src/location/qgeoplace.h
+++ b/src/location/qgeoplace.h
@@ -49,10 +49,10 @@
 #include "qgeoboundingbox.h"
 #include "qgeocoordinate.h"
 
-class QString;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QString;
 class QLandmark;
 
 class QGeoPlacePrivate;
@@ -91,6 +91,6 @@ private:
     friend class QLandmark;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/qgeoplace_p.h b/src/location/qgeoplace_p.h
index 7ee33e84..cad6c185 100644
--- a/src/location/qgeoplace_p.h
+++ b/src/location/qgeoplace_p.h
@@ -61,7 +61,7 @@
 #include "qgeoboundingbox.h"
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoPlacePrivate : public QSharedData
 {
@@ -86,19 +86,19 @@ public:
     QGeoAddress address;
 };
 
-QTM_END_NAMESPACE
 
 #if defined(Q_CC_MWERKS)
 // This results in multiple symbol definition errors on all other compilers
 // but not having a definition here results in an attempt to use the unspecialized
 // clone (which fails because of the pure virtuals above)
-template<> QTM_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone()
+template<> QGeoPlacePrivate *QSharedDataPointer<QGeoPlacePrivate>::clone()
 {
     return d->clone();
 }
 #else
-template<> QTM_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone();
+template<> QGeoPlacePrivate *QSharedDataPointer<QGeoPlacePrivate>::clone();
 #endif
 
+QT_END_NAMESPACE
 #endif
 
diff --git a/src/location/qgeopositioninfo.cpp b/src/location/qgeopositioninfo.cpp
index 19495ad4..25584b11 100644
--- a/src/location/qgeopositioninfo.cpp
+++ b/src/location/qgeopositioninfo.cpp
@@ -44,7 +44,7 @@
 #include <QDebug>
 #include <QDataStream>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoPositionInfoPrivate
 {
@@ -345,4 +345,4 @@ QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info)
 }
 #endif
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h
index c71646cd..37840755 100644
--- a/src/location/qgeopositioninfo.h
+++ b/src/location/qgeopositioninfo.h
@@ -46,14 +46,11 @@
 
 #include <QDateTime>
 
+QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
+
 class QDebug;
 class QDataStream;
-QT_END_NAMESPACE
-
-QT_BEGIN_HEADER
-
-QTM_BEGIN_NAMESPACE
 
 class QGeoPositionInfoPrivate;
 class Q_LOCATION_EXPORT QGeoPositionInfo
@@ -113,7 +110,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositio
 Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info);
 #endif
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp
index b11b8f7d..45c2aff0 100644
--- a/src/location/qgeopositioninfosource.cpp
+++ b/src/location/qgeopositioninfosource.cpp
@@ -66,7 +66,7 @@
 #endif
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QGeoPositionInfoSource
@@ -172,9 +172,9 @@ void QGeoPositionInfoSourcePrivate::loadDynamicPlugins(QHash<QString, QGeoPositi
     QString blockName;
 
     QSettings settings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat"));
-    QVariant value = settings.value("position.plugin.operator.whitelist");
+    QVariant value = settings.value(QLatin1String("position.plugin.operator.whitelist"));
     if (value.isValid()) {
-        QStringList parts = value.toString().split(",");
+        QStringList parts = value.toString().split(QLatin1String(","));
         if (parts.size() == 4) {
             QFile file(parts.at(1));
             file.open(QIODevice::ReadOnly);
@@ -374,9 +374,9 @@ QGeoPositionInfoSource::PositioningMethods QGeoPositionInfoSource::preferredPosi
 QGeoPositionInfoSource *QGeoPositionInfoSource::createDefaultSource(QObject *parent)
 {
     QSettings pluginSettings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat"));
-    QVariant value = pluginSettings.value("position.plugin.operator.whitelist");
+    QVariant value = pluginSettings.value(QLatin1String("position.plugin.operator.whitelist"));
     if (value.isValid()) {
-        QStringList parts = value.toString().split(",");
+        QStringList parts = value.toString().split(QLatin1String(","));
         if (parts.size() == 4) {
             QGeoPositionInfoSource *source = createSource(parts.at(0), parent);
             if (source)
@@ -403,7 +403,7 @@ QGeoPositionInfoSource *QGeoPositionInfoSource::createDefaultSource(QObject *par
 #elif defined(Q_WS_MEEGO)
     // Use Maemo6 backend if its available, otherwise use Geoclue backend
     QSettings maemo6Settings(QSettings::UserScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSatMaemo6"));
-    if (!maemo6Settings.value("maemo6positioningavailable").isValid()) {
+    if (!maemo6Settings.value(QLatin1String("maemo6positioningavailable")).isValid()) {
         QGeoPositionInfoSourceMaemo* maemo6Source = new QGeoPositionInfoSourceMaemo(parent);
         int status = maemo6Source->init();
         if (status == -1) {
@@ -560,4 +560,4 @@ QStringList QGeoPositionInfoSource::availableSources()
 
 #include "moc_qgeopositioninfosource.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h
index b11124d0..3d4eacd9 100644
--- a/src/location/qgeopositioninfosource.h
+++ b/src/location/qgeopositioninfosource.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoPositionInfoSourcePrivate;
 class Q_LOCATION_EXPORT QGeoPositionInfoSource : public QObject
@@ -100,7 +100,7 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoPositionInfoSource::PositioningMethods)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeopositioninfosource_geocluemaster.cpp b/src/location/qgeopositioninfosource_geocluemaster.cpp
index 334a4fcd..a3331e58 100644
--- a/src/location/qgeopositioninfosource_geocluemaster.cpp
+++ b/src/location/qgeopositioninfosource_geocluemaster.cpp
@@ -48,7 +48,7 @@
 #include "qgeopositioninfosource_geocluemaster_p.h"
 #include <gconf/gconf-client.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define MINIMUM_UPDATE_INTERVAL 1000
 #define UPDATE_TIMEOUT_COLD_START 120000
@@ -553,4 +553,4 @@ QGeoPositionInfo QGeoPositionInfoSourceGeoclueMaster::geoclueToPositionInfo(
 }
 
 #include "moc_qgeopositioninfosource_geocluemaster_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeopositioninfosource_geocluemaster_p.h b/src/location/qgeopositioninfosource_geocluemaster_p.h
index fba906a4..bac50355 100644
--- a/src/location/qgeopositioninfosource_geocluemaster_p.h
+++ b/src/location/qgeopositioninfosource_geocluemaster_p.h
@@ -60,7 +60,7 @@
 
 //#define Q_LOCATION_GEOCLUE_DEBUG
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoPositionInfoSourceGeoclueMaster : public QGeoPositionInfoSource
 {
@@ -136,6 +136,6 @@ private:
     PositioningMethods m_methods;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QGEOPOSITIONINFOSOURCE_GEOCLUEMASTER_H
diff --git a/src/location/qgeopositioninfosource_maemo.cpp b/src/location/qgeopositioninfosource_maemo.cpp
index e0461ad0..e8b6ea91 100644
--- a/src/location/qgeopositioninfosource_maemo.cpp
+++ b/src/location/qgeopositioninfosource_maemo.cpp
@@ -45,7 +45,7 @@
 
 using namespace std;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoPositionInfoSourceMaemo::QGeoPositionInfoSourceMaemo(QObject *parent): QGeoPositionInfoSource(parent)
 {
@@ -202,5 +202,5 @@ void QGeoPositionInfoSourceMaemo::shutdownRequestSession()
 }
 
 #include "moc_qgeopositioninfosource_maemo_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qgeopositioninfosource_maemo_p.h b/src/location/qgeopositioninfosource_maemo_p.h
index 8493cbf4..95bf1186 100644
--- a/src/location/qgeopositioninfosource_maemo_p.h
+++ b/src/location/qgeopositioninfosource_maemo_p.h
@@ -69,7 +69,7 @@ extern "C"
 }
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class DBusComm;
 class QGeoPositionInfoSourceMaemo : public QGeoPositionInfoSource
@@ -105,6 +105,6 @@ private Q_SLOTS:
     void requestTimerExpired();
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/qgeopositioninfosource_s60.cpp b/src/location/qgeopositioninfosource_s60.cpp
index ce0fdb60..179953fd 100644
--- a/src/location/qgeopositioninfosource_s60.cpp
+++ b/src/location/qgeopositioninfosource_s60.cpp
@@ -49,7 +49,7 @@
 
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 // constructor
 CQGeoPositionInfoSourceS60::CQGeoPositionInfoSourceS60(QObject* aParent) : QGeoPositionInfoSource(aParent),
@@ -960,4 +960,4 @@ void CQGeoPositionInfoSourceS60::disconnectNotify(const char *aSignal)
 
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeopositioninfosource_s60_p.h b/src/location/qgeopositioninfosource_s60_p.h
index 5d1639ef..4b595804 100644
--- a/src/location/qgeopositioninfosource_s60_p.h
+++ b/src/location/qgeopositioninfosource_s60_p.h
@@ -64,7 +64,7 @@
 
 #define MAX_SIZE 25
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 // CLASS DECLARATION
 //forward declaration
@@ -308,6 +308,6 @@ private:
     TUint8 mModuleFlags;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // CQGEOPOSITIONINFOSOURCES60_H
diff --git a/src/location/qgeopositioninfosource_simulator.cpp b/src/location/qgeopositioninfosource_simulator.cpp
index 9a9ea92c..82e4cd3d 100644
--- a/src/location/qgeopositioninfosource_simulator.cpp
+++ b/src/location/qgeopositioninfosource_simulator.cpp
@@ -52,7 +52,7 @@
 
 #include <QtNetwork/QLocalSocket>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 using namespace QtSimulatorPrivate;
 
@@ -163,4 +163,4 @@ void QGeoPositionInfoSourceSimulator::updatePosition()
 
 #include "moc_qgeopositioninfosource_simulator_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeopositioninfosource_simulator_p.h b/src/location/qgeopositioninfosource_simulator_p.h
index 774887d8..a208bf99 100644
--- a/src/location/qgeopositioninfosource_simulator_p.h
+++ b/src/location/qgeopositioninfosource_simulator_p.h
@@ -48,10 +48,9 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
 class QTimer;
 
-QTM_BEGIN_NAMESPACE
-
 class QGeoPositionInfoSourceSimulator : public QGeoPositionInfoSource
 {
     Q_OBJECT
@@ -80,6 +79,6 @@ private:
     QGeoPositionInfo lastPosition;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QGEOPOSITIONINFOSOURCESIMULATOR_H
diff --git a/src/location/qgeopositioninfosourcefactory.cpp b/src/location/qgeopositioninfosourcefactory.cpp
index 92f005ed..317ea473 100644
--- a/src/location/qgeopositioninfosourcefactory.cpp
+++ b/src/location/qgeopositioninfosourcefactory.cpp
@@ -41,7 +41,7 @@
 
 #include "qgeopositioninfosourcefactory.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
   \class QGeoPositionInfoSourceFactory
@@ -128,4 +128,4 @@ int QGeoPositionInfoSourceFactory::sourcePriority() const
 QGeoPositionInfoSourceFactory::~QGeoPositionInfoSourceFactory()
 {}
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeopositioninfosourcefactory.h b/src/location/qgeopositioninfosourcefactory.h
index ca1b53ca..fb01e9c5 100644
--- a/src/location/qgeopositioninfosourcefactory.h
+++ b/src/location/qgeopositioninfosourcefactory.h
@@ -47,7 +47,7 @@
 #include "qgeosatelliteinfosource.h"
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QGeoPositionInfoSourceFactory
 {
@@ -62,7 +62,7 @@ public:
     virtual QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent) = 0;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 #define QT_POSITION_SOURCE_INTERFACE "com.nokia.qt.mobility.position.sourcefactory/1.0"
diff --git a/src/location/qgeosatelliteinfo.cpp b/src/location/qgeosatelliteinfo.cpp
index d29f70a3..a9a594a0 100644
--- a/src/location/qgeosatelliteinfo.cpp
+++ b/src/location/qgeosatelliteinfo.cpp
@@ -44,7 +44,7 @@
 #include <QDebug>
 #include <QDataStream>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSatelliteInfoPrivate
 {
@@ -288,4 +288,4 @@ QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info)
 }
 #endif
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h
index bfa6d641..61047fc6 100644
--- a/src/location/qgeosatelliteinfo.h
+++ b/src/location/qgeosatelliteinfo.h
@@ -44,13 +44,10 @@
 #include "qmobilityglobal.h"
 
 QT_BEGIN_NAMESPACE
+QT_BEGIN_HEADER
 class QDebug;
 class QDataStream;
-QT_END_NAMESPACE
 
-QT_BEGIN_HEADER
-
-QTM_BEGIN_NAMESPACE
 
 class QGeoSatelliteInfoPrivate;
 class Q_LOCATION_EXPORT QGeoSatelliteInfo
@@ -104,7 +101,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelli
 Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info);
 #endif
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeosatelliteinfosource.cpp b/src/location/qgeosatelliteinfosource.cpp
index 95a5935e..716f04be 100644
--- a/src/location/qgeosatelliteinfosource.cpp
+++ b/src/location/qgeosatelliteinfosource.cpp
@@ -65,7 +65,7 @@
 #endif
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSatelliteInfoSourcePrivate
 {
@@ -113,9 +113,9 @@ void QGeoSatelliteInfoSourcePrivate::loadDynamicPlugins(QHash<QString, QGeoPosit
     QString blockName;
 
     QSettings settings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat"));
-    QVariant value = settings.value("position.plugin.operator.whitelist");
+    QVariant value = settings.value(QLatin1String("position.plugin.operator.whitelist"));
     if (value.isValid()) {
-        QStringList parts = value.toString().split(",");
+        QStringList parts = value.toString().split(QLatin1String(","));
         if (parts.size() == 4) {
             QFile file(parts.at(1));
             file.open(QIODevice::ReadOnly);
@@ -263,9 +263,9 @@ QGeoSatelliteInfoSource::QGeoSatelliteInfoSource(QObject *parent)
 QGeoSatelliteInfoSource *QGeoSatelliteInfoSource::createDefaultSource(QObject *parent)
 {
     QSettings pluginSettings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat"));
-    QVariant value = pluginSettings.value("position.plugin.operator.whitelist");
+    QVariant value = pluginSettings.value(QLatin1String("position.plugin.operator.whitelist"));
     if (value.isValid()) {
-        QStringList parts = value.toString().split(",");
+        QStringList parts = value.toString().split(QLatin1String(","));
         if (parts.size() == 4) {
             QGeoSatelliteInfoSource *source = createSource(parts.at(0), parent);
             if (source)
@@ -417,4 +417,4 @@ QStringList QGeoSatelliteInfoSource::availableSources()
 
 #include "moc_qgeosatelliteinfosource.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h
index f7b007dc..9b9a4cc3 100644
--- a/src/location/qgeosatelliteinfosource.h
+++ b/src/location/qgeosatelliteinfosource.h
@@ -50,7 +50,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSatelliteInfoSourcePrivate;
 class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject
@@ -79,7 +79,7 @@ private:
     QGeoSatelliteInfoSourcePrivate *d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeosatelliteinfosource_gypsy.cpp b/src/location/qgeosatelliteinfosource_gypsy.cpp
index 8b91688f..4f6de5d4 100644
--- a/src/location/qgeosatelliteinfosource_gypsy.cpp
+++ b/src/location/qgeosatelliteinfosource_gypsy.cpp
@@ -46,7 +46,7 @@
 #endif
 #include <QFile>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define UPDATE_TIMEOUT_COLD_START 120000
 
@@ -366,4 +366,4 @@ void QGeoSatelliteInfoSourceGypsy::requestUpdateTimeout()
 }
 
 #include "moc_qgeosatelliteinfosource_gypsy_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qgeosatelliteinfosource_gypsy_p.h b/src/location/qgeosatelliteinfosource_gypsy_p.h
index 631d0cf7..e7165882 100644
--- a/src/location/qgeosatelliteinfosource_gypsy_p.h
+++ b/src/location/qgeosatelliteinfosource_gypsy_p.h
@@ -63,7 +63,7 @@
 
 // #define Q_LOCATION_GYPSY_DEBUG
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 // An engine that encapsulates all symbols we want
 // to be able to mock (for unit/autotest purposes).
@@ -135,6 +135,6 @@ private:
       bool m_requestOngoing;
   };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QGEOSATELLITEINFOSOURCE_GYPSY_H
diff --git a/src/location/qgeosatelliteinfosource_maemo.cpp b/src/location/qgeosatelliteinfosource_maemo.cpp
index 7a3c7dad..f9d205ff 100644
--- a/src/location/qgeosatelliteinfosource_maemo.cpp
+++ b/src/location/qgeosatelliteinfosource_maemo.cpp
@@ -41,7 +41,7 @@
 
 #include "qgeosatelliteinfosource_maemo_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoSatelliteInfoSourceMaemo::QGeoSatelliteInfoSourceMaemo(QObject *parent) : QGeoSatelliteInfoSource(parent),
                                                                               running(false), satInViewSeen(false)
@@ -149,5 +149,5 @@ void QGeoSatelliteInfoSourceMaemo::onServiceConnect()
 
 
 #include "moc_qgeosatelliteinfosource_maemo_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qgeosatelliteinfosource_maemo_p.h b/src/location/qgeosatelliteinfosource_maemo_p.h
index 8ac7898b..a0376782 100644
--- a/src/location/qgeosatelliteinfosource_maemo_p.h
+++ b/src/location/qgeosatelliteinfosource_maemo_p.h
@@ -57,7 +57,7 @@
 #include "qgeosatelliteinfo.h"
 #include "dbuscomm_maemo_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSatelliteInfoSourceMaemo : public QGeoSatelliteInfoSource
 {
@@ -91,7 +91,7 @@ private:
     Q_DISABLE_COPY(QGeoSatelliteInfoSourceMaemo)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
 
diff --git a/src/location/qgeosatelliteinfosource_s60.cpp b/src/location/qgeosatelliteinfosource_s60.cpp
index 5d383016..6d57d458 100644
--- a/src/location/qgeosatelliteinfosource_s60.cpp
+++ b/src/location/qgeosatelliteinfosource_s60.cpp
@@ -51,7 +51,7 @@
 
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 // constructor
 CQGeoSatelliteInfoSourceS60::CQGeoSatelliteInfoSourceS60(QObject* aParent) : QGeoSatelliteInfoSource(aParent),
@@ -704,5 +704,5 @@ void CQGeoSatelliteInfoSourceS60::disconnectNotify(const char *aSignal)
 
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qgeosatelliteinfosource_s60_p.h b/src/location/qgeosatelliteinfosource_s60_p.h
index 7c02c5ea..bf0efee3 100644
--- a/src/location/qgeosatelliteinfosource_s60_p.h
+++ b/src/location/qgeosatelliteinfosource_s60_p.h
@@ -63,7 +63,7 @@
 
 #define MAX_SIZE 25
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 // CLASS DECLARATION
 //forward declaration
@@ -275,6 +275,6 @@ private:
     TUint8  mModuleFlags;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif /* QGEOSATELLITEINFOSOURCE60_H_ */
diff --git a/src/location/qgeosatelliteinfosource_simulator.cpp b/src/location/qgeosatelliteinfosource_simulator.cpp
index 0b35190d..86a38447 100644
--- a/src/location/qgeosatelliteinfosource_simulator.cpp
+++ b/src/location/qgeosatelliteinfosource_simulator.cpp
@@ -43,7 +43,7 @@
 #include "qlocationconnection_simulator_p.h"
 #include "qlocationdata_simulator_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QGeoSatelliteInfoSourceSimulator::QGeoSatelliteInfoSourceSimulator(QObject *parent)
     : QGeoSatelliteInfoSource(parent)
@@ -102,5 +102,5 @@ void QGeoSatelliteInfoSourceSimulator::updateData()
 }
 
 #include "moc_qgeosatelliteinfosource_simulator_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qgeosatelliteinfosource_simulator_p.h b/src/location/qgeosatelliteinfosource_simulator_p.h
index 7d4d934c..18bcab01 100644
--- a/src/location/qgeosatelliteinfosource_simulator_p.h
+++ b/src/location/qgeosatelliteinfosource_simulator_p.h
@@ -51,7 +51,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSatelliteInfoSourceSimulator : public QGeoSatelliteInfoSource
 {
@@ -74,7 +74,7 @@ private:
     QTimer *requestTimer;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QGEOSATELLITEINFOSOURCE_SIMULATOR_H
 
diff --git a/src/location/qlatin1constant.h b/src/location/qlatin1constant.h
index d5485507..a8746498 100644
--- a/src/location/qlatin1constant.h
+++ b/src/location/qlatin1constant.h
@@ -45,7 +45,7 @@
 #include <QString>
 #include <QVariant>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*
  * QLatin1Constant
@@ -158,6 +158,6 @@ template<int N> bool operator!=(const QString& b, const QLatin1Constant<N>& a)
 #define Q_DECLARE_LATIN1_CONSTANT(varname, str) static const QLatin1Constant<sizeof(str)> varname
 #define Q_DEFINE_LATIN1_CONSTANT(varname, str) const QLatin1Constant<sizeof(str)> varname = {str}
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/qlocationconnection_simulator.cpp b/src/location/qlocationconnection_simulator.cpp
index 50f47ccd..f147bce6 100644
--- a/src/location/qlocationconnection_simulator.cpp
+++ b/src/location/qlocationconnection_simulator.cpp
@@ -51,7 +51,7 @@
 
 #include <QtNetwork/QLocalSocket>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 using namespace QtSimulatorPrivate;
 
@@ -132,4 +132,4 @@ QGeoSatelliteInfoData *qtSatelliteInfo()
 }
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qlocationconnection_simulator_p.h b/src/location/qlocationconnection_simulator_p.h
index e9d5121a..029cc6f0 100644
--- a/src/location/qlocationconnection_simulator_p.h
+++ b/src/location/qlocationconnection_simulator_p.h
@@ -47,7 +47,7 @@
 
 QT_BEGIN_HEADER
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 namespace Simulator
 {
@@ -75,6 +75,6 @@ void ensureSimulatorConnection();
 QGeoPositionInfoData *qtPositionInfo();
 QGeoSatelliteInfoData *qtSatelliteInfo();
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QLOCATIONCONNECTION_H
diff --git a/src/location/qlocationdata_simulator.cpp b/src/location/qlocationdata_simulator.cpp
index f68a835f..49e04a06 100644
--- a/src/location/qlocationdata_simulator.cpp
+++ b/src/location/qlocationdata_simulator.cpp
@@ -43,7 +43,7 @@
 
 #include <QtCore/QDataStream>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 void qt_registerLocationTypes()
 {
@@ -94,4 +94,4 @@ QDataStream &operator>>(QDataStream &in, QGeoSatelliteInfoData::SatelliteInfo &s
     return in;
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qlocationdata_simulator_p.h b/src/location/qlocationdata_simulator_p.h
index 420acba9..4bfe4885 100644
--- a/src/location/qlocationdata_simulator_p.h
+++ b/src/location/qlocationdata_simulator_p.h
@@ -59,7 +59,7 @@
 #include <QtCore/QList>
 
 QT_BEGIN_HEADER
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 struct QGeoPositionInfoData
 {
@@ -100,7 +100,7 @@ struct QGeoSatelliteInfoData
 
 void qt_registerLocationTypes();
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QtMobility::QGeoPositionInfoData)
 Q_DECLARE_METATYPE(QtMobility::QGeoSatelliteInfoData)
diff --git a/src/location/qlocationutils.cpp b/src/location/qlocationutils.cpp
index 97d604f7..c210ed59 100644
--- a/src/location/qlocationutils.cpp
+++ b/src/location/qlocationutils.cpp
@@ -48,7 +48,7 @@
 
 #include <math.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 // converts e.g. 15306.0235 from NMEA sentence to 153.100392
 static double qlocationutils_nmeaDegreesToDecimal(double nmeaDegrees)
@@ -133,7 +133,7 @@ static void qlocationutils_readRmc(const char *data, int size, QGeoPositionInfo
         *hasFix = (parts[2][0] == 'A');
 
     if (parts.count() > 9 && parts[9].count() == 6) {
-        date = QDate::fromString(parts[9], "ddMMyy");
+        date = QDate::fromString(parts[9], QLatin1String("ddMMyy"));
         if (date.isValid())
             date = date.addYears(100);     // otherwise starts from 1900
         else
@@ -305,9 +305,9 @@ bool QLocationUtils::getNmeaTime(const QByteArray &bytes, QTime *time)
     QTime tempTime;
 
     if (dotIndex < 0) {
-        tempTime = QTime::fromString(bytes, "hhmmss");
+        tempTime = QTime::fromString(bytes, QLatin1String("hhmmss"));
     } else {
-        tempTime = QTime::fromString(bytes.mid(0, dotIndex), "hhmmss");
+        tempTime = QTime::fromString(bytes.mid(0, dotIndex), QLatin1String("hhmmss"));
         bool hasMsecs = false;
         int midLen = qMin(3, bytes.size() - dotIndex - 1);
         int msecs = bytes.mid(dotIndex + 1, midLen).toUInt(&hasMsecs);
@@ -350,5 +350,5 @@ bool QLocationUtils::getNmeaLatLong(const QByteArray &latString, char latDirecti
     return false;
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qlocationutils_p.h b/src/location/qlocationutils_p.h
index 2ceb3d9e..73e52de7 100644
--- a/src/location/qlocationutils_p.h
+++ b/src/location/qlocationutils_p.h
@@ -57,9 +57,6 @@
 QT_BEGIN_NAMESPACE
 class QTime;
 class QByteArray;
-QT_END_NAMESPACE
-
-QTM_BEGIN_NAMESPACE
 
 class QGeoPositionInfo;
 class QLocationUtils
@@ -100,6 +97,6 @@ public:
     Q_AUTOTEST_EXPORT static bool getNmeaLatLong(const QByteArray &latString, char latDirection, const QByteArray &lngString, char lngDirection, double *lat, double *lon);
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/qmlbackendao_s60.cpp b/src/location/qmlbackendao_s60.cpp
index 876e5465..e948fea4 100644
--- a/src/location/qmlbackendao_s60.cpp
+++ b/src/location/qmlbackendao_s60.cpp
@@ -43,7 +43,7 @@
 #include "qgeosatelliteinfosource_s60_p.h"
 #include "qmlbackendao_s60_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 //The name of the requestor //Added by PM
 //_LIT(KRequestor,"QTMobility Location");
@@ -475,4 +475,4 @@ void CQMLBackendAO::startUpdates()
     }
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qmlbackendao_s60_p.h b/src/location/qmlbackendao_s60_p.h
index 6152f7b2..e3aa591a 100644
--- a/src/location/qmlbackendao_s60_p.h
+++ b/src/location/qmlbackendao_s60_p.h
@@ -61,7 +61,7 @@
 #include "qgeopositioninfosource.h"
 //#include "qgeopositioninfosources60.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class CQGeoPositionInfoSourceS60 ;
 class CQGeoSatelliteInfoSourceS60;
@@ -158,6 +158,6 @@ private:
     TPositionSatelliteInfo mPosSatInfo;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QMLBACKENDAO_H
diff --git a/src/location/qmlbackendmonitorao_s60.cpp b/src/location/qmlbackendmonitorao_s60.cpp
index f5c763fc..91075f4c 100644
--- a/src/location/qmlbackendmonitorao_s60.cpp
+++ b/src/location/qmlbackendmonitorao_s60.cpp
@@ -48,7 +48,7 @@
 #include <lbttriggerconditionarea.h>
 #include <lbttriggerentry.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 //static member of the QMLBackendMonitorAO object holding the address of the object
@@ -153,5 +153,5 @@ QMLBackendMonitorAO::QMLBackendMonitorAO()
     CActiveScheduler::Add(this);
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
diff --git a/src/location/qmlbackendmonitorao_s60_p.h b/src/location/qmlbackendmonitorao_s60_p.h
index b42c248f..80ca6c82 100644
--- a/src/location/qmlbackendmonitorao_s60_p.h
+++ b/src/location/qmlbackendmonitorao_s60_p.h
@@ -61,7 +61,7 @@
 
 #include "qgeoareamonitor.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class CBackendMonitorInfo;
 
@@ -114,6 +114,6 @@ private:
     RLbt iLbt;  //subsession
 
 };
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif /* QMLBACKENDMONITORAO_H_ */
diff --git a/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp b/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp
index 2b8d42d6..c4029db0 100644
--- a/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp
+++ b/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp
@@ -44,7 +44,7 @@
 #include "qmlbackendmonitorinfo_s60_p.h"
 #include "qmlbackendmonitorcreatetriggerao_s60_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 //Sets the radius of the monitoring area, to  aRadius.If the Radius is less than the MinimumTriggerAreaSize(),
 //then aRadius will be set to MinimumTriggerAreaSize() supported by the LBT implementation.If the aRadius is
@@ -401,4 +401,4 @@ bool QMLBackendMonitorCreateTriggerAO::isTriggerInitialized(QGeoAreaMonitorS60*
     return (triggerInfo != NULL) ? TRUE : FALSE;
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h b/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h
index b6c7e90f..7b61635a 100644
--- a/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h
+++ b/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h
@@ -62,7 +62,7 @@
 #include <lbttriggerconditionarea.h>
 #include <lbttriggerentry.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoAreaMonitorS60;
 
@@ -108,6 +108,6 @@ private:
 
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif /* QMLBACKENDMONITORCREATETRIGGER_H_ */
diff --git a/src/location/qmlbackendmonitorinfo_s60.cpp b/src/location/qmlbackendmonitorinfo_s60.cpp
index 4c42b135..13fc8c55 100644
--- a/src/location/qmlbackendmonitorinfo_s60.cpp
+++ b/src/location/qmlbackendmonitorinfo_s60.cpp
@@ -42,7 +42,7 @@
 
 #include "qmlbackendmonitorinfo_s60_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 //singleton class object
 CBackendMonitorInfo* CBackendMonitorInfo::iBackendMonitorInfo = NULL;
@@ -154,4 +154,4 @@ CBackendMonitorInfo::~CBackendMonitorInfo()
     iBackendMonitorInfo = NULL;
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qmlbackendmonitorinfo_s60_p.h b/src/location/qmlbackendmonitorinfo_s60_p.h
index 118ddc81..831108b3 100644
--- a/src/location/qmlbackendmonitorinfo_s60_p.h
+++ b/src/location/qmlbackendmonitorinfo_s60_p.h
@@ -55,7 +55,7 @@
 
 #include "qmlbackendmonitorao_s60_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 //linked list information structure
 struct CMonitorTriggerInfo {
@@ -103,6 +103,6 @@ private :
     static CBackendMonitorInfo* iBackendMonitorInfo;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif /* QMLBACKENDMONITORINFO_H_ */
diff --git a/src/location/qmlbackendtriggerchangeao_s60.cpp b/src/location/qmlbackendtriggerchangeao_s60.cpp
index 60f8ccbf..9d990682 100644
--- a/src/location/qmlbackendtriggerchangeao_s60.cpp
+++ b/src/location/qmlbackendtriggerchangeao_s60.cpp
@@ -47,7 +47,7 @@
 #include <lbtsessiontrigger.h>
 #include <lbttriggerentry.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 //Design chnages
 
@@ -346,4 +346,4 @@ void QMLBackendTriggerChangeAO::ConstructL(RLbtServer& aLbtServ)
     }
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qmlbackendtriggerchangeao_s60_p.h b/src/location/qmlbackendtriggerchangeao_s60_p.h
index 4aaa396c..26dd1d40 100644
--- a/src/location/qmlbackendtriggerchangeao_s60_p.h
+++ b/src/location/qmlbackendtriggerchangeao_s60_p.h
@@ -62,7 +62,7 @@
 
 #include <lbt.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMLBackendTriggerChangeAO : public CActive
 {
@@ -91,6 +91,6 @@ private :
 
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif /* QMLBACKENDMONITORAO_H_ */
diff --git a/src/location/qmobilityglobal.h b/src/location/qmobilityglobal.h
index 19701476..b2311120 100644
--- a/src/location/qmobilityglobal.h
+++ b/src/location/qmobilityglobal.h
@@ -48,20 +48,20 @@
 //#define QTM_NAMESPACE QtMobility
 //#define QTM_NAMESPACE
 
-#ifdef QTM_NAMESPACE
+/*#ifdef QTM_NAMESPACE
 # define QTM_PREPEND_NAMESPACE(name) ::QTM_NAMESPACE::name
-# define QTM_BEGIN_NAMESPACE namespace QTM_NAMESPACE {
-# define QTM_END_NAMESPACE }
+# define QT_BEGIN_NAMESPACE namespace QTM_NAMESPACE {
+# define QT_END_NAMESPACE }
 # define QTM_USE_NAMESPACE using namespace QTM_NAMESPACE;
 #else
 # define QTM_PREPEND_NAMESPACE(name) ::name
-# define QTM_BEGIN_NAMESPACE
-# define QTM_END_NAMESPACE
+# define QT_BEGIN_NAMESPACE
+# define QT_END_NAMESPACE
 # define QTM_USE_NAMESPACE
-#endif
+#endif*/
 
 //in case Qt is in namespace
-QT_USE_NAMESPACE
+//QT_USE_NAMESPACE
 
 #endif // QMOBILITYGLOBAL_H
 
diff --git a/src/location/qmobilitypluginsearch.h b/src/location/qmobilitypluginsearch.h
index ee5a56e6..9c14751d 100644
--- a/src/location/qmobilitypluginsearch.h
+++ b/src/location/qmobilitypluginsearch.h
@@ -50,7 +50,7 @@
 # include <f32file.h>
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #if defined(Q_OS_SYMBIAN)
 static inline bool qSymbian_CheckDir(const QDir& dir, RFs& rfs)
@@ -167,6 +167,6 @@ inline QStringList mobilityPlugins(const QString& plugintype)
     return  plugins;
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/qnmeapositioninfosource.cpp b/src/location/qnmeapositioninfosource.cpp
index db07e82c..55ec396c 100644
--- a/src/location/qnmeapositioninfosource.cpp
+++ b/src/location/qnmeapositioninfosource.cpp
@@ -47,7 +47,7 @@
 #include <QTimer>
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QNmeaRealTimeReader::QNmeaRealTimeReader(QNmeaPositionInfoSourcePrivate *sourcePrivate)
         : QNmeaReader(sourcePrivate)
@@ -620,4 +620,4 @@ int QNmeaPositionInfoSource::minimumUpdateInterval() const
 #include "moc_qnmeapositioninfosource.cpp"
 #include "moc_qnmeapositioninfosource_p.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h
index 5c315dc9..7d7966b3 100644
--- a/src/location/qnmeapositioninfosource.h
+++ b/src/location/qnmeapositioninfosource.h
@@ -44,13 +44,10 @@
 #include "qmobilityglobal.h"
 #include "qgeopositioninfosource.h"
 
-QT_BEGIN_NAMESPACE
-class QIODevice;
-QT_END_NAMESPACE
-
 QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+class QIODevice;
 
 class QNmeaPositionInfoSourcePrivate;
 class Q_LOCATION_EXPORT QNmeaPositionInfoSource : public QGeoPositionInfoSource
@@ -93,7 +90,7 @@ private:
     QNmeaPositionInfoSourcePrivate *d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qnmeapositioninfosource_p.h b/src/location/qnmeapositioninfosource_p.h
index b1360db9..b37682ac 100644
--- a/src/location/qnmeapositioninfosource_p.h
+++ b/src/location/qnmeapositioninfosource_p.h
@@ -59,15 +59,12 @@
 #include <QQueue>
 #include <QPointer>
 
+QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
+
 class QBasicTimer;
 class QTimerEvent;
 class QTimer;
-QT_END_NAMESPACE
-
-QT_BEGIN_HEADER
-
-QTM_BEGIN_NAMESPACE
 
 class QNmeaReader;
 struct QPendingGeoPositionInfo {
@@ -173,7 +170,7 @@ private:
     bool m_hasValidDateTime;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/plugins/geoservices/nokia/jsonparser.h b/src/plugins/geoservices/nokia/jsonparser.h
index 5ea0a690..d39f4771 100644
--- a/src/plugins/geoservices/nokia/jsonparser.h
+++ b/src/plugins/geoservices/nokia/jsonparser.h
@@ -53,6 +53,8 @@
 #include <QString>
 #include <QRegExp>
 
+QT_BEGIN_NAMESPACE
+
 class JSONParser
 {
 public:
@@ -238,4 +240,6 @@ public:
     }
 };
 
+QT_END_NAMESPACE
+
 #endif // JSONPARSER_H
diff --git a/src/plugins/geoservices/nokia/marclanguagecodes.h b/src/plugins/geoservices/nokia/marclanguagecodes.h
index 5f2accac..57bc57cd 100644
--- a/src/plugins/geoservices/nokia/marclanguagecodes.h
+++ b/src/plugins/geoservices/nokia/marclanguagecodes.h
@@ -53,6 +53,8 @@
 // http://www.loc.gov/marc/languages/language_code.html
 // Order matches QLocale::Language
 
+QT_BEGIN_NAMESPACE
+
 static const unsigned char marc_language_code_list[] =
     "\0\0\0" // Unused
     "\0\0\0" // C
@@ -271,5 +273,6 @@ static const unsigned char marc_language_code_list[] =
     "\0\0\0" // Shambala
     ;
 
+QT_END_NAMESPACE
 
 #endif /* MARCLANGUAGECODES_H_ */
diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
index 900ee479..e4cc33d3 100644
--- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
@@ -51,6 +51,8 @@
 #include <QXmlStreamReader>
 #include <QIODevice>
 
+QT_BEGIN_NAMESPACE
+
 QGeoCodeXmlParser::QGeoCodeXmlParser()
         : m_reader(0)
 {
@@ -574,3 +576,4 @@ bool QGeoCodeXmlParser::parseCoordinate(QGeoCoordinate *coordinate, const QStrin
     return true;
 }
 
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.h b/src/plugins/geoservices/nokia/qgeocodexmlparser.h
index c866d93f..d82965aa 100644
--- a/src/plugins/geoservices/nokia/qgeocodexmlparser.h
+++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.h
@@ -53,15 +53,15 @@
 #include <QList>
 #include <QXmlStreamReader>
 
-class QIODevice;
 
 #include <qgeocoordinate.h>
 #include <qgeoboundingbox.h>
 #include <qgeoplace.h>
 #include <qgeoaddress.h>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
+class QIODevice;
 class QGeoCodeXmlParser
 {
 public:
@@ -87,4 +87,6 @@ private:
     QString m_errorString;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
index 80b907c2..3bd6b708 100644
--- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
@@ -69,8 +69,12 @@
 #define DISK_CACHE_ENABLED 1
 #endif
 
+QT_BEGIN_NAMESPACE
+
 #if defined(Q_OS_SYMBIAN)
 #include <f32file.h>
+
+
 QChar QGeoMappingManagerEngineNokia::findFirstInternalFlashDrive()
 {
     QChar flashDrive;
@@ -300,3 +304,4 @@ QString QGeoMappingManagerEngineNokia::mapTypeToStr(QGraphicsGeoMap::MapType typ
         return "normal.day";
 }
 
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h
index 89f145dc..70c6cfe1 100644
--- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h
@@ -54,11 +54,11 @@
 #include <qgeoserviceprovider.h>
 #include <qgeotiledmappingmanagerengine.h>
 
+QT_BEGIN_NAMESPACE
+
 class QNetworkAccessManager;
 class QNetworkDiskCache;
 
-QTM_USE_NAMESPACE
-
 class QGeoMappingManagerEngineNokia : public QGeoTiledMappingManagerEngine
 {
     Q_OBJECT
@@ -89,4 +89,6 @@ private:
     QString m_referer;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
index 30f583e3..1f11d72a 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
@@ -51,6 +51,8 @@
 #include <QNetworkCacheMetaData>
 #include <QDateTime>
 
+QT_BEGIN_NAMESPACE
+
 QGeoMapReplyNokia::QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTiledMapRequest &request, QObject *parent)
         : QGeoTiledMapReply(request, parent),
         m_reply(reply)
@@ -135,3 +137,5 @@ void QGeoMapReplyNokia::networkError(QNetworkReply::NetworkError error)
     m_reply->deleteLater();
     m_reply = 0;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
index 6bc6e405..ee0195bb 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
@@ -52,7 +52,7 @@
 #include <qgeotiledmapreply.h>
 #include <QNetworkReply>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMapReplyNokia : public QGeoTiledMapReply
 {
@@ -75,4 +75,6 @@ private:
     QNetworkReply *m_reply;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
index 1a61f878..c2ea29c5 100644
--- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
@@ -51,6 +51,8 @@
 
 #include <qgeorouterequest.h>
 
+QT_BEGIN_NAMESPACE
+
 QGeoRouteReplyNokia::QGeoRouteReplyNokia(const QGeoRouteRequest &request, QNetworkReply *reply, QObject *parent)
         : QGeoRouteReply(request, parent),
         m_reply(reply)
@@ -120,3 +122,5 @@ void QGeoRouteReplyNokia::networkError(QNetworkReply::NetworkError error)
     m_reply->deleteLater();
     m_reply = 0;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
index 0fcd11a4..38b4e534 100644
--- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
@@ -52,7 +52,7 @@
 #include <qgeoroutereply.h>
 #include <QNetworkReply>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoRouteReplyNokia : public QGeoRouteReply
 {
@@ -71,4 +71,6 @@ private:
     QNetworkReply *m_reply;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
index ba6e5227..e8d2f328 100644
--- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
@@ -53,6 +53,8 @@
 #include <QStringList>
 #include <QString>
 
+QT_BEGIN_NAMESPACE
+
 QGeoRouteXmlParser::QGeoRouteXmlParser(const QGeoRouteRequest &request)
         : m_request(request),
         m_reader(0)
@@ -558,3 +560,5 @@ bool QGeoRouteXmlParser::parseBoundingBox(QGeoBoundingBox &bounds)
 
     return false;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
index d6269358..02ef640b 100644
--- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
+++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
@@ -54,8 +54,6 @@
 #include <QString>
 #include <QXmlStreamReader>
 
-class QIODevice;
-
 #include <qgeoroute.h>
 #include <qgeoroutesegment.h>
 #include <qgeocoordinate.h>
@@ -63,7 +61,9 @@ class QIODevice;
 #include <qgeorouterequest.h>
 #include <qgeomaneuver.h>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
+class QIODevice;
+
 
 class QGeoManeuverContainer
 {
@@ -114,4 +114,5 @@ private:
     QList<QGeoRouteSegmentContainer> segments;
 };
 
+QT_END_NAMESPACE
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index 4590f38b..f92e20ac 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -54,6 +54,8 @@
 #include <QUrl>
 #include <qgeoboundingbox.h>
 
+QT_BEGIN_NAMESPACE
+
 QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(const QMap<QString, QVariant> &parameters, QGeoServiceProvider::Error *error, QString *errorString)
         : QGeoRoutingManagerEngine(parameters),
         m_host("prd.lbsp.navteq.com"),
@@ -475,3 +477,5 @@ void QGeoRoutingManagerEngineNokia::routeError(QGeoRouteReply::Error error, cons
 
     emit this->error(reply, error, errorString);
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
index f0e4a173..0dd17b0c 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
@@ -55,7 +55,7 @@
 #include <qgeoroutingmanagerengine.h>
 #include <QNetworkAccessManager>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoRoutingManagerEngineNokia : public QGeoRoutingManagerEngine
 {
@@ -89,4 +89,6 @@ private:
     QString m_referer;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
index 388283be..91db792a 100644
--- a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
@@ -56,6 +56,8 @@
 #include <QUrl>
 #include <QMap>
 
+QT_BEGIN_NAMESPACE
+
 QGeoSearchManagerEngineNokia::QGeoSearchManagerEngineNokia(const QMap<QString, QVariant> &parameters, QGeoServiceProvider::Error *error, QString *errorString)
         : QGeoSearchManagerEngine(parameters),
         m_host("loc.desktop.maps.svc.ovi.com"),
@@ -315,3 +317,5 @@ QString QGeoSearchManagerEngineNokia::languageToMarc(QLocale::Language language)
 
     return code;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
index f0b112e1..0ca23e61 100644
--- a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
@@ -58,7 +58,7 @@
 #include <QLocale>
 
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSearchManagerEngineNokia : public QGeoSearchManagerEngine
 {
@@ -95,4 +95,6 @@ private:
     QString m_referer;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp
index fd43c5bc..c3f157c4 100644
--- a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp
@@ -49,6 +49,8 @@
 #include "qgeosearchreply_nokia.h"
 #include "qgeocodexmlparser.h"
 
+QT_BEGIN_NAMESPACE
+
 QGeoSearchReplyNokia::QGeoSearchReplyNokia(QNetworkReply *reply, int limit, int offset, QGeoBoundingArea *viewport, QObject *parent)
         : QGeoSearchReply(parent),
         m_reply(reply)
@@ -129,3 +131,5 @@ void QGeoSearchReplyNokia::networkError(QNetworkReply::NetworkError error)
     m_reply->deleteLater();
     m_reply = 0;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h
index f97ec55d..9c47dd6b 100644
--- a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h
@@ -52,7 +52,7 @@
 #include <qgeosearchreply.h>
 #include <QNetworkReply>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoSearchReplyNokia : public QGeoSearchReply
 {
@@ -71,4 +71,6 @@ private:
     QNetworkReply *m_reply;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
index 5b8e65d3..ae6d9a1a 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
@@ -55,6 +55,8 @@
 #include <QtPlugin>
 #include <QNetworkProxy>
 
+QT_BEGIN_NAMESPACE
+
 QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia() {}
 
 QGeoServiceProviderFactoryNokia::~QGeoServiceProviderFactoryNokia() {}
@@ -94,3 +96,5 @@ const QString QGeoServiceProviderFactoryNokia::defaultToken("152022572f0e44e0748
 const QString QGeoServiceProviderFactoryNokia::defaultReferer("qtlocationapi");
 
 Q_EXPORT_PLUGIN2(qtgeoservices_nokia, QGeoServiceProviderFactoryNokia)
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
index c0117302..0013f40d 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
@@ -52,7 +52,7 @@
 #include <qgeoserviceproviderfactory.h>
 #include <QObject>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoServiceProviderFactoryNokia : public QObject, public QGeoServiceProviderFactory
 {
@@ -79,4 +79,6 @@ public:
     static const QString defaultReferer;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
index 9a3d06be..72918f25 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
@@ -55,7 +55,7 @@
 #include <QNetworkAccessManager>
 #include <QNetworkProxy>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
  Constructs a new tiled map data object, which stores the map data required by
@@ -185,7 +185,7 @@ QString QGeoTiledMapDataNokia::getViewCopyright()
 /*!
  \reimp
  */
-void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyleOptionGraphicsItem *option)
+void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/)
 {
     QRect viewport = painter->combinedTransform().inverted().mapRect(painter->viewport());
 
@@ -234,3 +234,5 @@ void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyle
         lastCopyright
     );
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
index 38d6004f..8fd01c00 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
@@ -52,7 +52,7 @@
 #include <QPixmap>
 #include <QNetworkReply>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGeoMappingManagerEngineNokia;
 
@@ -92,4 +92,6 @@ private slots:
     void copyrightReplyFinished(QNetworkReply*);
 };
 
+QT_END_NAMESPACE
+
 #endif // QGEOMAPDATA_NOKIA_H
diff --git a/tests/systemtests/sys_location.qtt b/tests/systemtests/sys_location.qtt
index 4b2e0c0c..c4828bf6 100644
--- a/tests/systemtests/sys_location.qtt
+++ b/tests/systemtests/sys_location.qtt
@@ -461,8 +461,116 @@ testcase = {
     | Tap on Plus button | Verify that map is zoomed in |
     | Tap on Plus button | Verify that zoom level is decreased and map is displayed correctly with new zoom level |'
         ));
-    }
+/*    },
+
+    // \groups BAT,5.0,MOBILITY-2893,RESEARCH
+    qml_route_for_two_close_points: function()
+    {
+//1. Use qml_mapviewer to test. Find a route for 2 close enough locations, like from CBD to Eight Mile Plains: (-27.575, 153.088)->(-27.465, 153.023)
+//2. Use qml_mapviewer to test. Find a route for 2 close enough locations (like from CBD to Eight Mile Plains).(Street: Brandl st,City: Eight Mile Plains, country: Australia)->(Street: Ann st, City: Brisbane, Country: Australia)
+    },
+
+    // \groups BAT,5.0,MOBILITY-2893,RESEARCH
+    qml_route_for_two_distant_points: function()
+    {
+//1. Use qml_mapviewer to test. Find a route for 2 distant locations, like from Brisbane to Sydney: (-27.4709,153.0235)->(-33.8689,151.2071)
+//2. Use qml_mapviewer to test. Find a route for 2 distant locations (like from Brisbane to Sydney)
+    },
+
+    // \groups BAT,5.0,MOBILITY-2893,RESEARCH
+    qml_route_for_multiple_points: function()
+    {
+// Use qml_mapviewer to test. Find a route for >2 way points, like Eight Mile Plains->CBD->Aspley: (-27.575, 153.088)->(-27.465, 153.023)->(-27.3614,153.0043)
+    },
 
+    // \groups BAT,5.0,MOBILITY-2893,RESEARCH
+    qml_route_travel_mode: function()
+    {
+// 1. Travel mode: pedestrian. Use qml_mapviewer to test. (55 Bordeaux Street, Eight Mile Plains QLD)->(53 Brandl St, Eight Mile Plains QLD 4113) or (-27.5784,153.0934)->(-27.5798,153.1003)
+// 2. Travel mode: bicycle
+// 3. Travel mode: public transport
+// 4. Travel mode: by truck
+    },
+
+    // \groups BAT,5.0,MOBILITY-2893,RESEARCH
+    qml_route_feature_type: function()
+    {
+// 1. Feature type: no feature
+// 2. Feature type: toll
+// 3. Feature type: highway
+// 4. Feature type: public transit
+// 5. Feature type: ferry
+// 6. Feature type: tunnel
+// 7. Feature type: dirt road
+// 8. Feature type: parks
+// 9. Feature type: motor pool lane
+    },
+
+    // \groups BAT,5.0,MOBILITY-2893,RESEARCH
+    qml_route_optimization: function()
+    {
+// 1. Route optimization: shortest
+// 2. Route optimization: fastest
+// 3. Route optimization: most economic
+// 4. Route optimization: most scenic
+    },
+
+    // \groups BAT,5.0,MOBILITY-2900,RESEARCH
+    qml_geocode_australian_location: function()
+    {
+// Use qml_mapviewer to test. Get coordinates for an Australian location (53 Brandl St, Eight Mile Plains, QLD for example)
+    },
+
+    // \groups BAT,5.0,MOBILITY-2900,RESEARCH
+    qml_geocode_russian_location: function()
+    {
+// Use qml_mapviewer to test. Get coordinates for a location of country which uses non-English languages (Minina I Pozharskogo Ploshchad, Nizhniy Novgorod, Russian Federation)
+    },
+
+    // \groups BAT,5.0,MOBILITY-2900,RESEARCH
+    qml_geocode_fictional_location: function()
+    {
+// city: TheBestCity
+    },
+
+    // \groups BAT,5.0,MOBILITY-2900,RESEARCH
+    qml_geocode_not_unique_location: function()
+    {
+// city: Moscow
+    },
+
+    // \groups BAT,5.0,MOBILITY-2900,RESEARCH
+    qml_geocode: function()
+    {
+// 1. Use qml_mapviewer to test. Get coordinates for an Australian location (Street number: 53, Street: Brandl St, City: Brisbane)
+// 2. Use qml_mapviewer to test. Get coordinates for an Australian location (Contry code: 61, District:Fortitude Valley, Street: Wickham St)
+// 3. Use qml_mapviewer to test. Get coordinates for a city name which is not uniqe in the world, but unique in the country (City: Moscow, Country: Russia)
+// 4. Use qml_mapviewer to test. Get coordinates for a county: (County: West Midlands, Country: United Kingdom)
+    },
+
+    // \groups BAT,5.0,MOBILITY-2901,RESEARCH
+    qml_reverse_geocode_australian_place: function()
+    {
+// Use qml_mapviewer to test. Geocode some Brisbane's coordinates (-27.5789,153.0995)
+    },
+
+    // \groups BAT,5.0,MOBILITY-2901,RESEARCH
+    qml_reverse_geocode_russian_place: function()
+    {
+// Use qml_mapviewer to test. Geocode some Russian's coordinates (56.3264,44.0048)
+    },
+
+    // \groups BAT,5.0,MOBILITY-2901,RESEARCH
+    qml_reverse_geocode_uninhabited_place: function()
+    {
+// Use qml_mapviewer to test. Geocode some coordinates from Pacific Ocean (-27.1911,153.2428)
+    },
+
+    // \groups BAT,5.0,MOBILITY-2902,RESEARCH
+    qml_searching: function()
+    {
+// Seacrh for landmarks*/
+    }
 
 }  // end of testcase
author	Qt Continuous Integration System <qt-info@nokia.com>	2011-06-28 17:49:41 +1000
committer	Qt Continuous Integration System <qt-info@nokia.com>	2011-06-28 17:49:41 +1000
commit	8acf30adfa51aba4ee0f2fdd71c9c50e9c759a23 (patch)
tree	a853895bea338b3caf079fbbca6bdbad6e56a314
parent	9ea12ecb8e008e176867df6f0f0e24b0af802959 (diff)
parent	35721609275e38c1d35203cd2c5ee5c2a07f9763 (diff)