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

Conflicts:
	.qmake.conf

Change-Id: Idf2f674fc45e7ceb4563bc1d86180c3431dfa62f

1 files changed, 1 insertions, 72 deletions

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" }
-        }
-    }
 }