Merge branch '5.5' into dev

Change-Id: Id8b1ea1c9dc774aa6f0169c410be2c141e384da6

1 files changed, 83 insertions, 1 deletions

diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index 9ea738f4..853c55cb 100644
--- a/src/imports/positioning/plugins.qmltypes
+++ b/src/imports/positioning/plugins.qmltypes
@@ -1,4 +1,4 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
@@ -7,6 +7,7 @@ import QtQuick.tooling 1.1
 // 'qmlplugindump -nonrelocatable QtPositioning 5.5'
 
 Module {
+    dependencies: []
     Component {
         name: "LocationSingleton"
         prototype: "QObject"
@@ -60,6 +61,16 @@ Module {
             type: "QGeoCircle"
             Parameter { name: "center"; type: "QGeoCoordinate" }
         }
+        Method {
+            name: "shapeToCircle"
+            type: "QGeoCircle"
+            Parameter { name: "shape"; type: "QGeoShape" }
+        }
+        Method {
+            name: "shapeToRectangle"
+            type: "QGeoRectangle"
+            Parameter { name: "shape"; type: "QGeoShape" }
+        }
     }
     Component {
         name: "QDeclarativeGeoAddress"
@@ -201,4 +212,75 @@ 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: "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" }
+        }
+    }
 }