Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	.qmake.conf

Change-Id: Idf2f674fc45e7ceb4563bc1d86180c3431dfa62f

6 files changed, 171 insertions, 537 deletions

diff --git a/.gitignore b/.gitignore
index bb0e0364..5b60c37d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,14 @@ config.log
 moc_*.cpp
 ui_*.h
 qrc_*.cpp
-
+qmlplugindump_wrapper.sh
+uic_wrapper.sh
+qdbusxml2cpp_wrapper.sh
+qdoc_wrapper.sh
+qhelpgenerator_wrapper.sh
+target_wrapper.sh
+QtPositioning.version*
+QtLocation.version*
 src/positioning/doc/snippets/cpp/positioning_cppsnippet
 src/location/doc/snippets/cpp/cppsnippet
 src/location/doc/snippets/places/placescppsnippet
@@ -55,6 +62,20 @@ examples/positioning/weatherinfo/weatherinfo
 config.tests/geoclue/geoclue
 config.tests/gypsy/gypsy
 
+# don't track qdbusxml2cpp generated files for geoclue plugin
+# they are no different than moc files
+geoclue_interface.cpp
+geoclue_interface.h
+master_interface.cpp
+master_interface.h
+masterclient_interface.cpp
+masterclient_interface.h
+position_interface.cpp
+position_interface.h
+satellite_interface.cpp
+satellite_interface.h
+velocity_interface.cpp
+velocity_interface.h
 
 # Test generated files
 
diff --git a/dist/changes-5.6.0 b/dist/changes-5.6.0
new file mode 100644
index 00000000..14023431
--- /dev/null
+++ b/dist/changes-5.6.0
@@ -0,0 +1,69 @@
+Qt 5.6 introduces many new features and improvements as well as bugfixes
+over the 5.5.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+QtPositioning
+-------------
+
+ - Removed Blackberry 10 support.
+ - [QTBUG-40702] Removed dependency towards libgeoclue. The plugin uses the
+   GeoClue DBus interface.
+ - Enabled Position plugin for OS X. Previously only the plugin was only working
+   for iOS.
+ - [QTBUG-48082] Added QtSerialPort based NMEA position plugin for Windows.
+ - Improved and fixed the WinRT position backend. Various changes on the WinRT
+   platform caused the necessity for such and update.
+ - Fixed endless requests towards Android's LocationManager when stopUpdates() was not
+   called in pair with startUpdates().
+
+QtLocation
+----------
+
+ - First stable release of the Qt Location API. The QML API changed significantly
+   compared to the Qt 5.5 release. The changes are documented in the official
+   module documentation under "API changes".
+ - Improved the Flick and Pinch implementation for QML Map.
+ - [QTBUG-44809] Fixed tile version handling
+ - Fixed crash during Map.setVisibleRegion while no plugin has been set.
+ - Improved error reporting in map, geocoding and routing model APIs.
+ - QTBUG[36919] Added means to prevent stealing  of mouse/touch grabs on map.
+ - Improved coordinate related animation handling. Previously an animation along
+   the longitude always used a shortest path direction. Now it is possible to set
+   the direction for the animation.
+ - [QTBUG-46147] Fixed crash in QML Map element.
+ - [QTBUG-44311] Fixed bouncing Map flick on zoom level 2.
+ - [QTBUG-47020] & [QTBUG-47019] Improved Mouse and keyboard integration of QML Map
+ - [QTBUG-46388] Fixed Pinch when no MouseArea overlaps QML Map element.
+ - Fixed various unit test.
+ - Fixed a variety of minor documentation issues.
+ - Fixed dysfunctional tile cache for OSM plugin due to the server delivering JPEG
+   file when PNG files were expected.
+ - [QTBUG-41187] Unified the default tile cache location on disk.
+ - Fixed crash in gesture area while receiving wheel events.
+ - Fixed route requests with excluded areas for HERE plugin.
+ - Added support for custom map background color.
+ - Improved Map rendering performance throughout the QML API.
+ - [QTBUG-49772] Fixed weatherinfo example due to missing appid handling for
+   openweatermap.org.
+ - [QTBUG-47292] Added ability to clear the map cache.
+ - [QTBUG-50060] Improved performance of QML MapPolyline.
+ - [QTBUG-50240] Fixed OSM routing to handle changed server status code for a
+   successful route retrieval.
+ - [QTBUG-50519] Fixed map in mapviewer example when displaying the minimap.
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 548c796a..f299d153 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -157,11 +157,11 @@ public:
             // Implicitly registers 5.3 & 5.4
 
             minor = 5;
-            //TODO: this is broken QTBUG-40043
+            //TODO: this is broken QTBUG-50990
             qmlRegisterUncreatableType<QDeclarativeGeoMapType, 1>(uri, major, minor, "MapType",
                                                   QStringLiteral("MapType is not intended instantiable by developer."));
             minor = 6;
-            //TODO: this is broken QTBUG-40043
+            //TODO: this is broken QTBUG-50990
             qmlRegisterUncreatableType<QQuickGeoMapGestureArea, 1>(uri, major, minor, "MapGestureArea",
                                         QStringLiteral("(Map)GestureArea is not intended instantiable by developer."));
 
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index 105e8713..61a1cd28 100644
--- a/src/imports/location/plugins.qmltypes
+++ b/src/imports/location/plugins.qmltypes
@@ -7,272 +7,7 @@ import QtQuick.tooling 1.2
 // 'qmlplugindump -nonrelocatable QtLocation 5.6'
 
 Module {
-    dependencies: []
-    Component {
-        name: "QAbstractItemModel"
-        prototype: "QObject"
-        Enum {
-            name: "LayoutChangeHint"
-            values: {
-                "NoLayoutChangeHint": 0,
-                "VerticalSortHint": 1,
-                "HorizontalSortHint": 2
-            }
-        }
-        Signal {
-            name: "dataChanged"
-            Parameter { name: "topLeft"; type: "QModelIndex" }
-            Parameter { name: "bottomRight"; type: "QModelIndex" }
-            Parameter { name: "roles"; type: "QVector<int>" }
-        }
-        Signal {
-            name: "dataChanged"
-            Parameter { name: "topLeft"; type: "QModelIndex" }
-            Parameter { name: "bottomRight"; type: "QModelIndex" }
-        }
-        Signal {
-            name: "headerDataChanged"
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "layoutChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
-        }
-        Signal {
-            name: "layoutChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-        }
-        Signal { name: "layoutChanged" }
-        Signal {
-            name: "layoutAboutToBeChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
-        }
-        Signal {
-            name: "layoutAboutToBeChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-        }
-        Signal { name: "layoutAboutToBeChanged" }
-        Signal {
-            name: "rowsAboutToBeInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsAboutToBeRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal { name: "modelAboutToBeReset" }
-        Signal { name: "modelReset" }
-        Signal {
-            name: "rowsAboutToBeMoved"
-            Parameter { name: "sourceParent"; type: "QModelIndex" }
-            Parameter { name: "sourceStart"; type: "int" }
-            Parameter { name: "sourceEnd"; type: "int" }
-            Parameter { name: "destinationParent"; type: "QModelIndex" }
-            Parameter { name: "destinationRow"; type: "int" }
-        }
-        Signal {
-            name: "rowsMoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-            Parameter { name: "destination"; type: "QModelIndex" }
-            Parameter { name: "row"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeMoved"
-            Parameter { name: "sourceParent"; type: "QModelIndex" }
-            Parameter { name: "sourceStart"; type: "int" }
-            Parameter { name: "sourceEnd"; type: "int" }
-            Parameter { name: "destinationParent"; type: "QModelIndex" }
-            Parameter { name: "destinationColumn"; type: "int" }
-        }
-        Signal {
-            name: "columnsMoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-            Parameter { name: "destination"; type: "QModelIndex" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method { name: "submit"; type: "bool" }
-        Method { name: "revert" }
-        Method {
-            name: "hasIndex"
-            type: "bool"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "hasIndex"
-            type: "bool"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method {
-            name: "index"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "index"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method {
-            name: "parent"
-            type: "QModelIndex"
-            Parameter { name: "child"; type: "QModelIndex" }
-        }
-        Method {
-            name: "sibling"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "idx"; type: "QModelIndex" }
-        }
-        Method {
-            name: "rowCount"
-            type: "int"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "rowCount"; type: "int" }
-        Method {
-            name: "columnCount"
-            type: "int"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "columnCount"; type: "int" }
-        Method {
-            name: "hasChildren"
-            type: "bool"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "hasChildren"; type: "bool" }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "index"; type: "QModelIndex" }
-        }
-        Method {
-            name: "setData"
-            type: "bool"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "setData"
-            type: "bool"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Method {
-            name: "headerData"
-            type: "QVariant"
-            Parameter { name: "section"; type: "int" }
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "headerData"
-            type: "QVariant"
-            Parameter { name: "section"; type: "int" }
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-        }
-        Method {
-            name: "fetchMore"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "canFetchMore"
-            type: "bool"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "flags"
-            type: "Qt::ItemFlags"
-            Parameter { name: "index"; type: "QModelIndex" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "hits"; type: "int" }
-            Parameter { name: "flags"; type: "Qt::MatchFlags" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "hits"; type: "int" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-    }
-    Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
+    dependencies: ["QtQuick 2.0"]
     Component {
         name: "QDeclarativeCategory"
         prototype: "QObject"
@@ -409,6 +144,7 @@ Module {
         Property { name: "error"; type: "QGeoServiceProvider::Error"; isReadonly: true }
         Property { name: "errorString"; type: "string"; isReadonly: true }
         Property { name: "visibleRegion"; type: "QGeoShape" }
+        Property { name: "color"; type: "QColor" }
         Signal {
             name: "pluginChanged"
             Parameter { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
@@ -425,6 +161,10 @@ Module {
             name: "copyrightLinkActivated"
             Parameter { name: "link"; type: "string" }
         }
+        Signal {
+            name: "colorChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
         Method {
             name: "removeMapItem"
             Parameter { name: "item"; type: "QDeclarativeGeoMapItemBase"; isPointer: true }
@@ -456,15 +196,6 @@ Module {
             type: "QPointF"
             Parameter { name: "coordinate"; type: "QGeoCoordinate" }
         }
-        Method {
-            name: "toScreenPosition"
-            type: "QPointF"
-            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
-        }
-        Method {
-            name: "fitViewportToGeoShape"
-            Parameter { name: "shape"; type: "QVariant" }
-        }
         Method { name: "fitViewportToMapItems" }
         Method {
             name: "pan"
@@ -472,6 +203,7 @@ Module {
             Parameter { name: "dy"; type: "int" }
         }
         Method { name: "prefetchData" }
+        Method { name: "clearData" }
     }
     Component {
         name: "QDeclarativeGeoMapItemBase"
@@ -491,19 +223,6 @@ Module {
         Property { name: "autoFitViewport"; type: "bool" }
     }
     Component {
-        name: "QDeclarativeGeoMapPinchEvent"
-        prototype: "QObject"
-        exports: ["QtLocation/MapPinchEvent 5.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "center"; type: "QPointF"; isReadonly: true }
-        Property { name: "angle"; type: "double"; isReadonly: true }
-        Property { name: "point1"; type: "QPointF"; isReadonly: true }
-        Property { name: "point2"; type: "QPointF"; isReadonly: true }
-        Property { name: "pointCount"; type: "int"; isReadonly: true }
-        Property { name: "accepted"; type: "bool" }
-    }
-    Component {
         name: "QDeclarativeGeoMapQuickItem"
         defaultProperty: "data"
         prototype: "QDeclarativeGeoMapItemBase"
@@ -1187,14 +906,39 @@ Module {
             isReadonly: true
             isPointer: true
         }
+        Method { name: "pathLength"; type: "int" }
         Method {
             name: "addCoordinate"
             Parameter { name: "coordinate"; type: "QGeoCoordinate" }
         }
         Method {
+            name: "insertCoordinate"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
+        }
+        Method {
+            name: "replaceCoordinate"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
+        }
+        Method {
+            name: "coordinateAt"
+            type: "QGeoCoordinate"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "containsCoordinate"
+            type: "bool"
+            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
+        }
+        Method {
             name: "removeCoordinate"
             Parameter { name: "coordinate"; type: "QGeoCoordinate" }
         }
+        Method {
+            name: "removeCoordinate"
+            Parameter { name: "index"; type: "int" }
+        }
     }
     Component {
         name: "QDeclarativeRatings"
@@ -1373,6 +1117,19 @@ Module {
         Method { name: "errorString"; type: "string" }
     }
     Component {
+        name: "QGeoMapPinchEvent"
+        prototype: "QObject"
+        exports: ["QtLocation/MapPinchEvent 5.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "center"; type: "QPointF"; isReadonly: true }
+        Property { name: "angle"; type: "double"; isReadonly: true }
+        Property { name: "point1"; type: "QPointF"; isReadonly: true }
+        Property { name: "point2"; type: "QPointF"; isReadonly: true }
+        Property { name: "pointCount"; type: "int"; isReadonly: true }
+        Property { name: "accepted"; type: "bool" }
+    }
+    Component {
         name: "QQmlPropertyMap"
         prototype: "QObject"
         exports: ["QtLocation/ExtendedAttributes 5.0"]
@@ -1396,203 +1153,45 @@ Module {
         isCreatable: false
         exportMetaObjectRevisions: [0, 1]
         Enum {
-            name: "ActiveGesture"
+            name: "GeoMapGesture"
             values: {
                 "NoGesture": 0,
-                "ZoomGesture": 1,
+                "PinchGesture": 1,
                 "PanGesture": 2,
                 "FlickGesture": 4
             }
         }
         Enum {
-            name: "ActiveGestures"
+            name: "AcceptedGestures"
             values: {
                 "NoGesture": 0,
-                "ZoomGesture": 1,
+                "PinchGesture": 1,
                 "PanGesture": 2,
                 "FlickGesture": 4
             }
         }
         Property { name: "enabled"; type: "bool" }
-        Property { name: "pinchEnabled"; type: "bool" }
-        Property { name: "panEnabled"; type: "bool" }
-        Property { name: "isPinchActive"; type: "bool"; isReadonly: true }
-        Property { name: "isPanActive"; type: "bool"; isReadonly: true }
-        Property { name: "activeGestures"; type: "ActiveGestures" }
+        Property { name: "pinchActive"; type: "bool"; isReadonly: true }
+        Property { name: "panActive"; type: "bool"; isReadonly: true }
+        Property { name: "acceptedGestures"; type: "AcceptedGestures" }
         Property { name: "maximumZoomLevelChange"; type: "double" }
         Property { name: "flickDeceleration"; type: "double" }
         Property { name: "preventStealing"; revision: 1; type: "bool" }
-        Signal { name: "panActiveChanged" }
-        Signal { name: "pinchActiveChanged" }
         Signal {
             name: "pinchStarted"
-            Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
+            Parameter { name: "pinch"; type: "QGeoMapPinchEvent"; isPointer: true }
         }
         Signal {
             name: "pinchUpdated"
-            Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
+            Parameter { name: "pinch"; type: "QGeoMapPinchEvent"; isPointer: true }
         }
         Signal {
             name: "pinchFinished"
-            Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
+            Parameter { name: "pinch"; type: "QGeoMapPinchEvent"; isPointer: true }
         }
         Signal { name: "panStarted" }
         Signal { name: "panFinished" }
         Signal { name: "flickStarted" }
         Signal { name: "flickFinished" }
     }
-    Component {
-        name: "QQuickItem"
-        defaultProperty: "data"
-        prototype: "QObject"
-        Enum {
-            name: "TransformOrigin"
-            values: {
-                "TopLeft": 0,
-                "Top": 1,
-                "TopRight": 2,
-                "Left": 3,
-                "Center": 4,
-                "Right": 5,
-                "BottomLeft": 6,
-                "Bottom": 7,
-                "BottomRight": 8
-            }
-        }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
-    }
 }
diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index a47aa277..c3451c2a 100644
--- a/src/imports/positioning/plugins.qmltypes
+++ b/src/imports/positioning/plugins.qmltypes
@@ -7,7 +7,7 @@ import QtQuick.tooling 1.2
 // 'qmlplugindump -nonrelocatable QtPositioning 5.6'
 
 Module {
-    dependencies: []
+    dependencies: ["QtQuick 2.0"]
     Component {
         name: "LocationSingleton"
         prototype: "QObject"
@@ -205,44 +205,6 @@ Module {
         Method { name: "toString"; type: "string" }
     }
     Component {
-        name: "QQuickAbstractAnimation"
-        prototype: "QObject"
-        Enum {
-            name: "Loops"
-            values: {
-                "Infinite": -2
-            }
-        }
-        Property { name: "running"; type: "bool" }
-        Property { name: "paused"; type: "bool" }
-        Property { name: "alwaysRunToEnd"; type: "bool" }
-        Property { name: "loops"; type: "int" }
-        Signal { name: "started" }
-        Signal { name: "stopped" }
-        Signal {
-            name: "runningChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "pausedChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "alwaysRunToEndChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "loopCountChanged"
-            Parameter { type: "int" }
-        }
-        Method { name: "restart" }
-        Method { name: "start" }
-        Method { name: "pause" }
-        Method { name: "resume" }
-        Method { name: "stop" }
-        Method { name: "complete" }
-    }
-    Component {
         name: "QQuickGeoCoordinateAnimation"
         prototype: "QQuickPropertyAnimation"
         exports: ["QtPositioning/CoordinateAnimation 5.3"]
@@ -259,37 +221,4 @@ Module {
         Property { name: "to"; type: "QGeoCoordinate" }
         Property { name: "direction"; type: "Direction" }
     }
-    Component {
-        name: "QQuickPropertyAnimation"
-        prototype: "QQuickAbstractAnimation"
-        Property { name: "duration"; type: "int" }
-        Property { name: "from"; type: "QVariant" }
-        Property { name: "to"; type: "QVariant" }
-        Property { name: "easing"; type: "QEasingCurve" }
-        Property { name: "target"; type: "QObject"; isPointer: true }
-        Property { name: "property"; type: "string" }
-        Property { name: "properties"; type: "string" }
-        Property { name: "targets"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "exclude"; type: "QObject"; isList: true; isReadonly: true }
-        Signal {
-            name: "durationChanged"
-            Parameter { type: "int" }
-        }
-        Signal {
-            name: "fromChanged"
-            Parameter { type: "QVariant" }
-        }
-        Signal {
-            name: "toChanged"
-            Parameter { type: "QVariant" }
-        }
-        Signal {
-            name: "easingChanged"
-            Parameter { type: "QEasingCurve" }
-        }
-        Signal {
-            name: "propertiesChanged"
-            Parameter { type: "string" }
-        }
-    }
 }
diff --git a/src/location/doc/src/qtlocation-changes.qdoc b/src/location/doc/src/qtlocation-changes.qdoc
index 1c79c582..1330412d 100644
--- a/src/location/doc/src/qtlocation-changes.qdoc
+++ b/src/location/doc/src/qtlocation-changes.qdoc
@@ -30,6 +30,12 @@
 \title Qt Location QML API changes since 5.4
 \brief Information about the Qt Location QML API changes since 5.4
 
+This page lists the QtLocation QML API changes since the first Qt Location Technology Preview
+in Qt 5.4. Since Qt 5.6 this API is considered to be final and subsequent releases will
+not break the given API anymore.
+
+\note The public C++ API remained binary compatible since Qt 5.4.
+
 \b{\l{QtLocation::Map}{Map} Component}
 \list
     \li removed wheelAngleChanged() signal
@@ -40,17 +46,27 @@
     \li added \l[QML]{QtLocation::Map::}{fromCoordinate}() method
     \li replaced cameraStopped() method with \l[QML]{QtLocation::Map::}{prefetchData} method
     \li replaced fitViewportToGeoShape() method with \l[QML]{QtLocation::Map::}{visibleRegion} property
-
+    \li added \l[QML]{QtLocation::Map::}{color} property
+    \li added \l[QML]{QtLocation::Map::}{clearData} method
 \endlist
 
 \b{\l{QtLocation::MapGestureArea}{MapGestureArea} Component}
 \list
- \li added missing panActiveChanged() signal to \l[QML]{QtLocation::MapGestureArea::}{panActive} property
  \li removed movementStopped() signal
- \li replaced isPanActive, isPinchActive with panActive, pinchActive
- \li replaced activeGestures with acceptedGestures
- \li replaced ZoomGesture with PinchGesture
- \li removed properties panEnabled pinchEnable, please use acceptedGestures instead
+ \li replaced isPanActive and isPinchActive properties with \l[QML]{QtLocation::MapGestureArea::}{panActive}
+     and \l[QML]{QtLocation::MapGestureArea::}{pinchActive} properties
+ \li replaced activeGestures with \l[QML]{QtLocation::MapGestureArea::}{acceptedGestures}
+ \li replaced MapGestureArea.ZoomGesture with \l[QML]{QtLocation::MapGestureArea::acceptedGestures}{MapGestureArea.PinchGesture}
+ \li removed properties panEnabled and pinchEnabled, please use \l[QML]{QtLocation::MapGestureArea::}{acceptedGestures} instead
+\endlist
+
+\b{\l{QtLocation::MapPolyline}{MapPolyline} Component}
+\list
+ \li added \l[QML]{QtLocation::MapPolyline::}{containsCoordinate} method
+ \li added \l[QML]{QtLocation::MapPolyline::}{coordinateAt} method
+ \li added \l[QML]{QtLocation::MapPolyline::}{insertCoordinate} method
+ \li added \l[QML]{QtLocation::MapPolyline::}{replaceCoordinate} method
+ \li added \l[QML]{QtLocation::MapPolyline::}{removeCoordinate} method
 \endlist
 
 \b Geoservice's plugin parameters