Update plugins.qmltypes

Task-number: QTBUG-70264
Change-Id: I85978cfaaefae0a849e743de06740fc55740e89c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

2 files changed, 64 insertions, 286 deletions

diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro
index 57b3bd37..562e02b8 100644
--- a/src/chartsqml2/chartsqml2.pro
+++ b/src/chartsqml2/chartsqml2.pro
@@ -56,6 +56,9 @@ contains(QT_CONFIG, opengl) {
 HEADERS += $$PRIVATE_HEADERS
 INCLUDEPATH += $$PWD
 
+IMPORT_VERSION = 2.3
+QMAKE_QMLPLUGINDUMP_FLAGS = -qapp
+
 load(qml_plugin)
 
 win32 {
diff --git a/src/chartsqml2/plugins.qmltypes b/src/chartsqml2/plugins.qmltypes
index 2a7a52ba..2b2a3e47 100644
--- a/src/chartsqml2/plugins.qmltypes
+++ b/src/chartsqml2/plugins.qmltypes
@@ -4,280 +4,10 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtCharts 2.0'
+// 'qmlplugindump -nonrelocatable -qapp QtCharts 2.3'
 
 Module {
-    dependencies: []
-    Component {
-        name: "QAbstractItemModel"
-        prototype: "QObject"
-        exports: [
-            "QtCharts/AbstractItemModel 1.0",
-            "QtCharts/AbstractItemModel 2.0"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 0]
-        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" }
-        }
-    }
+    dependencies: ["QtQuick 2.12"]
     Component {
         name: "QGraphicsObject"
         defaultProperty: "children"
@@ -919,14 +649,14 @@ Module {
                 "SeriesTypeBar": 2,
                 "SeriesTypeStackedBar": 3,
                 "SeriesTypePercentBar": 4,
-                "SeriesTypeBoxPlot": 5,
-                "SeriesTypeCandlestick": 6,
-                "SeriesTypePie": 7,
-                "SeriesTypeScatter": 8,
-                "SeriesTypeSpline": 9,
-                "SeriesTypeHorizontalBar": 10,
-                "SeriesTypeHorizontalStackedBar": 11,
-                "SeriesTypeHorizontalPercentBar": 12
+                "SeriesTypePie": 5,
+                "SeriesTypeScatter": 6,
+                "SeriesTypeSpline": 7,
+                "SeriesTypeHorizontalBar": 8,
+                "SeriesTypeHorizontalStackedBar": 9,
+                "SeriesTypeHorizontalPercentBar": 10,
+                "SeriesTypeBoxPlot": 11,
+                "SeriesTypeCandlestick": 12
             }
         }
         Property { name: "theme"; type: "Theme" }
@@ -948,7 +678,7 @@ Module {
             isReadonly: true
             isPointer: true
         }
-        Property { name: "plotArea"; revision: 1; type: "QRectF"; isReadonly: true }
+        Property { name: "plotArea"; revision: 1; type: "QRectF" }
         Property { name: "plotAreaColor"; revision: 3; type: "QColor" }
         Property { name: "axes"; revision: 2; type: "QAbstractAxis"; isList: true; isReadonly: true }
         Property { name: "localizeNumbers"; revision: 4; type: "bool" }
@@ -1960,6 +1690,11 @@ Module {
         Property { name: "y"; type: "double" }
     }
     Component {
+        name: "QtCharts::LegendScroller"
+        defaultProperty: "children"
+        prototype: "QtCharts::QLegend"
+    }
+    Component {
         name: "QtCharts::QAbstractAxis"
         prototype: "QObject"
         exports: [
@@ -2121,6 +1856,7 @@ Module {
         Property { name: "labelsFormat"; type: "string" }
         Property { name: "labelsPosition"; type: "LabelsPosition" }
         Property { name: "labelsAngle"; type: "double" }
+        Property { name: "labelsPrecision"; type: "int" }
         Signal {
             name: "clicked"
             Parameter { name: "index"; type: "int" }
@@ -2160,6 +1896,10 @@ Module {
             Parameter { name: "angle"; type: "double" }
         }
         Signal {
+            name: "labelsPrecisionChanged"
+            Parameter { name: "precision"; type: "int" }
+        }
+        Signal {
             name: "barsetsAdded"
             Parameter { name: "sets"; type: "QList<QBarSet*>" }
         }
@@ -2652,6 +2392,15 @@ Module {
         exports: ["QtCharts/Legend 1.0", "QtCharts/Legend 2.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0, 0]
+        Enum {
+            name: "MarkerShape"
+            values: {
+                "MarkerShapeDefault": 0,
+                "MarkerShapeRectangle": 1,
+                "MarkerShapeCircle": 2,
+                "MarkerShapeFromSeries": 3
+            }
+        }
         Property { name: "alignment"; type: "Qt::Alignment" }
         Property { name: "backgroundVisible"; type: "bool" }
         Property { name: "color"; type: "QColor" }
@@ -2660,6 +2409,7 @@ Module {
         Property { name: "labelColor"; type: "QColor" }
         Property { name: "reverseMarkers"; type: "bool" }
         Property { name: "showToolTips"; type: "bool" }
+        Property { name: "markerShape"; type: "MarkerShape" }
         Signal {
             name: "backgroundVisibleChanged"
             Parameter { name: "visible"; type: "bool" }
@@ -2688,6 +2438,10 @@ Module {
             name: "showToolTipsChanged"
             Parameter { name: "showToolTips"; type: "bool" }
         }
+        Signal {
+            name: "markerShapeChanged"
+            Parameter { name: "shape"; type: "MarkerShape" }
+        }
     }
     Component { name: "QtCharts::QLineSeries"; prototype: "QtCharts::QXYSeries" }
     Component {
@@ -2699,6 +2453,8 @@ Module {
         Property { name: "max"; type: "double" }
         Property { name: "labelFormat"; type: "string" }
         Property { name: "base"; type: "double" }
+        Property { name: "tickCount"; type: "int"; isReadonly: true }
+        Property { name: "minorTickCount"; type: "int" }
         Signal {
             name: "minChanged"
             Parameter { name: "min"; type: "double" }
@@ -2720,6 +2476,14 @@ Module {
             name: "baseChanged"
             Parameter { name: "base"; type: "double" }
         }
+        Signal {
+            name: "tickCountChanged"
+            Parameter { name: "tickCount"; type: "int" }
+        }
+        Signal {
+            name: "minorTickCountChanged"
+            Parameter { name: "minorTickCount"; type: "int" }
+        }
     }
     Component { name: "QtCharts::QPercentBarSeries"; prototype: "QtCharts::QAbstractBarSeries" }
     Component {
@@ -2935,17 +2699,25 @@ Module {
         exports: [
             "QtCharts/ValueAxis 1.1",
             "QtCharts/ValueAxis 2.0",
+            "QtCharts/ValueAxis 2.3",
             "QtCharts/ValuesAxis 1.0"
         ]
-        exportMetaObjectRevisions: [0, 0, 0]
+        exportMetaObjectRevisions: [0, 0, 1, 0]
+        Enum {
+            name: "TickType"
+            values: {
+                "TicksDynamic": 0,
+                "TicksFixed": 1
+            }
+        }
         Property { name: "tickCount"; type: "int" }
         Property { name: "min"; type: "double" }
         Property { name: "max"; type: "double" }
         Property { name: "labelFormat"; type: "string" }
         Property { name: "minorTickCount"; type: "int" }
-        Property { name: "tickInterval"; type: "double" }
-        Property { name: "tickAnchor"; type: "double" }
-        Property { name: "tickType"; type: "TickType" }
+        Property { name: "tickAnchor"; revision: 1; type: "double" }
+        Property { name: "tickInterval"; revision: 1; type: "double" }
+        Property { name: "tickType"; revision: 1; type: "TickType" }
         Signal {
             name: "minChanged"
             Parameter { name: "min"; type: "double" }
@@ -2973,15 +2745,18 @@ Module {
         }
         Signal {
             name: "tickIntervalChanged"
+            revision: 1
             Parameter { name: "interval"; type: "double" }
         }
         Signal {
             name: "tickAnchorChanged"
+            revision: 1
             Parameter { name: "anchor"; type: "double" }
         }
         Signal {
             name: "tickTypeChanged"
-            Parameter { name: "type"; type: "TickType" }
+            revision: 1
+            Parameter { name: "type"; type: "QValueAxis::TickType" }
         }
         Method { name: "applyNiceNumbers" }
     }