Merge remote-tracking branch 'origin/dev' into wip/cmake

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

2 files changed, 31 insertions, 22 deletions

diff --git a/src/imports/shapes/plugin.cpp b/src/imports/shapes/plugin.cpp
index 6197b2fdf5..0b6191d5bb 100644
--- a/src/imports/shapes/plugin.cpp
+++ b/src/imports/shapes/plugin.cpp
@@ -57,20 +57,11 @@ public:
     void registerTypes(const char *uri) override
     {
         Q_ASSERT(QByteArray(uri) == QByteArray("QtQuick.Shapes"));
-        qmlRegisterType<QQuickShape>(uri, 1, 0, "Shape");
-        qmlRegisterType<QQuickShapePath>(uri, 1, 0, "ShapePath");
-        qmlRegisterUncreatableType<QQuickShapeGradient>(uri, 1, 0, "ShapeGradient", QQuickShapeGradient::tr("ShapeGradient is an abstract base class"));
-        qmlRegisterType<QQuickShapeLinearGradient>(uri, 1, 0, "LinearGradient");
-        qmlRegisterType<QQuickShapeRadialGradient>(uri, 1, 0, "RadialGradient");
-        qmlRegisterType<QQuickShapeConicalGradient>(uri, 1, 0, "ConicalGradient");
+        qmlRegisterTypesAndRevisions<QQuickShape, QQuickShapePath, QQuickShapeGradient,
+                                     QQuickShapeLinearGradient, QQuickShapeRadialGradient,
+                                     QQuickShapeConicalGradient>(uri, 1);
 
         qmlRegisterModule(uri, 1, 15);
-
-        // revision in Qt 5.11: added containsMode property
-        qmlRegisterType<QQuickShape, 11>(uri, 1, 11, "Shape");
-
-        // revision in Qt 5.14: added scale property
-        qmlRegisterType<QQuickShapePath, 14>(uri, 1, 14, "ShapePath"); // QTBUG-61942
     }
 };
 
diff --git a/src/imports/shapes/plugins.qmltypes b/src/imports/shapes/plugins.qmltypes
index cd779e7149..fed68b5137 100644
--- a/src/imports/shapes/plugins.qmltypes
+++ b/src/imports/shapes/plugins.qmltypes
@@ -12,8 +12,14 @@ Module {
         name: "QQuickShape"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["QtQuick.Shapes/Shape 1.0", "QtQuick.Shapes/Shape 1.11"]
-        exportMetaObjectRevisions: [0, 11]
+        exports: [
+            "QtQuick.Shapes/Shape 1.0",
+            "QtQuick.Shapes/Shape 1.1",
+            "QtQuick.Shapes/Shape 1.11",
+            "QtQuick.Shapes/Shape 1.4",
+            "QtQuick.Shapes/Shape 1.7"
+        ]
+        exportMetaObjectRevisions: [0, 1, 11, 4, 7]
         Enum {
             name: "RendererType"
             values: {
@@ -51,8 +57,11 @@ Module {
         name: "QQuickShapeConicalGradient"
         defaultProperty: "stops"
         prototype: "QQuickShapeGradient"
-        exports: ["QtQuick.Shapes/ConicalGradient 1.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Shapes/ConicalGradient 1.0",
+            "QtQuick.Shapes/ConicalGradient 1.12"
+        ]
+        exportMetaObjectRevisions: [0, 12]
         Property { name: "centerX"; type: "double" }
         Property { name: "centerY"; type: "double" }
         Property { name: "angle"; type: "double" }
@@ -61,9 +70,12 @@ Module {
         name: "QQuickShapeGradient"
         defaultProperty: "stops"
         prototype: "QQuickGradient"
-        exports: ["QtQuick.Shapes/ShapeGradient 1.0"]
+        exports: [
+            "QtQuick.Shapes/ShapeGradient 1.0",
+            "QtQuick.Shapes/ShapeGradient 1.12"
+        ]
         isCreatable: false
-        exportMetaObjectRevisions: [0]
+        exportMetaObjectRevisions: [0, 12]
         Enum {
             name: "SpreadMode"
             values: {
@@ -78,8 +90,11 @@ Module {
         name: "QQuickShapeLinearGradient"
         defaultProperty: "stops"
         prototype: "QQuickShapeGradient"
-        exports: ["QtQuick.Shapes/LinearGradient 1.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Shapes/LinearGradient 1.0",
+            "QtQuick.Shapes/LinearGradient 1.12"
+        ]
+        exportMetaObjectRevisions: [0, 12]
         Property { name: "x1"; type: "double" }
         Property { name: "y1"; type: "double" }
         Property { name: "x2"; type: "double" }
@@ -142,8 +157,11 @@ Module {
         name: "QQuickShapeRadialGradient"
         defaultProperty: "stops"
         prototype: "QQuickShapeGradient"
-        exports: ["QtQuick.Shapes/RadialGradient 1.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Shapes/RadialGradient 1.0",
+            "QtQuick.Shapes/RadialGradient 1.12"
+        ]
+        exportMetaObjectRevisions: [0, 12]
         Property { name: "centerX"; type: "double" }
         Property { name: "centerY"; type: "double" }
         Property { name: "centerRadius"; type: "double" }