Fix qmlf1legends example for Qt 6

QtQuick.XmlListModel is no longer available in Qt 6, as it was provided
by QtXmlPatterns module, which is no longer available. Replaced it with
simply ListModel.

Change-Id: I06d8c2253df40a8cfea608647b2d3429ee9c1fa6
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

5 files changed, 114 insertions, 124 deletions

diff --git a/examples/charts/qmlf1legends/CMakeLists.txt b/examples/charts/qmlf1legends/CMakeLists.txt
index 354a11b5..69b418e9 100644
--- a/examples/charts/qmlf1legends/CMakeLists.txt
+++ b/examples/charts/qmlf1legends/CMakeLists.txt
@@ -39,7 +39,7 @@ target_link_libraries(qmlf1legends PUBLIC
 
 # Resources:
 set(resources_resource_files
-    "qml/qmlf1legends/SpeedsXml.qml"
+    "qml/qmlf1legends/SpeedsList.qml"
     "qml/qmlf1legends/main.qml"
 )
 
diff --git a/examples/charts/qmlf1legends/qml/qmlf1legends/SpeedsList.qml b/examples/charts/qmlf1legends/qml/qmlf1legends/SpeedsList.qml
new file mode 100644
index 00000000..0eaad5ec
--- /dev/null
+++ b/examples/charts/qmlf1legends/qml/qmlf1legends/SpeedsList.qml
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Charts module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQml.Models
+
+//![1]
+ListModel {
+    // Hard-coded test data
+    ListElement { speedTrap:0; driver: "Fittipaldi"; speed:104.12 }
+        ListElement { speedTrap:0; driver:"Stewart"; speed:106.12 }
+        ListElement { speedTrap:0; driver:"Hunt"; speed:106.12 }
+//![1]
+        ListElement { speedTrap:1; driver:"Fittipaldi"; speed:115.12 }
+        ListElement { speedTrap:1; driver:"Stewart"; speed:114.12 }
+        ListElement { speedTrap:1; driver:"Hunt"; speed:115.12 }
+        ListElement { speedTrap:2; driver:"Hunt"; speed:165.23 }
+        ListElement { speedTrap:2; driver:"Fittipaldi"; speed:175.23 }
+        ListElement { speedTrap:2; driver:"Stewart"; speed:168.23 }
+        ListElement { speedTrap:3; driver:"Hunt"; speed:104.87 }
+        ListElement { speedTrap:3; driver:"Fittipaldi"; speed:104.43 }
+        ListElement { speedTrap:3; driver:"Stewart"; speed:94.83 }
+        ListElement { speedTrap:4; driver:"Hunt"; speed:107.87 }
+        ListElement { speedTrap:4; driver:"Fittipaldi"; speed:111.84 }
+        ListElement { speedTrap:4; driver:"Stewart"; speed:106.84 }
+        ListElement { speedTrap:5; driver:"Hunt"; speed:94.87 }
+        ListElement { speedTrap:5; driver:"Stewart"; speed:92.37 }
+        ListElement { speedTrap:5; driver:"Fittipaldi"; speed:99.37 }
+        ListElement { speedTrap:6; driver:"Hunt"; speed:52.87 }
+        ListElement { speedTrap:6; driver:"Fittipaldi"; speed:42.87 }
+        ListElement { speedTrap:6; driver:"Stewart"; speed:55.87 }
+        ListElement { speedTrap:7; driver:"Hunt"; speed:77.87 }
+        ListElement { speedTrap:7; driver:"Fittipaldi"; speed:72.87 }
+        ListElement { speedTrap:7; driver:"Stewart"; speed:87.87 }
+        ListElement { speedTrap:8; driver:"Hunt"; speed:94.17 }
+        ListElement { speedTrap:8; driver:"Fittipaldi"; speed:98.17 }
+        ListElement { speedTrap:8; driver:"Stewart"; speed:84.17 }
+        ListElement { speedTrap:9; driver:"Hunt"; speed:91.87 }
+        ListElement { speedTrap:9; driver:"Fittipaldi"; speed:71.87 }
+        ListElement { speedTrap:9; driver:"Stewart"; speed:81.87 }
+        ListElement { speedTrap:10; driver:"Hunt"; speed:104.87 }
+        ListElement { speedTrap:10; driver:"Fittipaldi"; speed:115.87 }
+        ListElement { speedTrap:10; driver:"Stewart"; speed:119.87 }
+        ListElement { speedTrap:11; driver:"Hunt"; speed:162.87 }
+        ListElement { speedTrap:11; driver:"Fittipaldi"; speed:155.84 }
+        ListElement { speedTrap:11; driver:"Stewart"; speed:152.84 }
+        ListElement { speedTrap:12; driver:"Hunt"; speed:181.87 }
+        ListElement { speedTrap:12; driver:"Fittipaldi"; speed:161.85 }
+        ListElement { speedTrap:12; driver:"Stewart"; speed:167.85 }
+        ListElement { speedTrap:13; driver:"Hunt"; speed:155.87 }
+        ListElement { speedTrap:13; driver:"Fittipaldi"; speed:154.87 }
+        ListElement { speedTrap:13; driver:"Stewart"; speed:164.87 }
+        ListElement { speedTrap:14; driver:"Hunt"; speed:197.57 }
+        ListElement { speedTrap:14; driver:"Fittipaldi"; speed:187.54 }
+        ListElement { speedTrap:14; driver:"Stewart"; speed:180.54 }
+        ListElement { speedTrap:15; driver:"Fittipaldi"; speed:216.87 }
+        ListElement { speedTrap:15; driver:"Hunt"; speed:207.87 }
+        ListElement { speedTrap:15; driver:"Stewart"; speed:197.87 }
+        ListElement { speedTrap:16; driver:"Hunt"; speed:82.87 }
+        ListElement { speedTrap:16; driver:"Fittipaldi"; speed:79.37 }
+        ListElement { speedTrap:16; driver:"Stewart"; speed:85.37 }
+        ListElement { speedTrap:17; driver:"Hunt"; speed:153.87 }
+        ListElement { speedTrap:17; driver:"Fittipaldi"; speed:143.87 }
+        ListElement { speedTrap:17; driver:"Stewart"; speed:133.87 }
+        ListElement { speedTrap:18; driver:"Hunt"; speed:89.87 }
+        ListElement { speedTrap:18; driver:"Fittipaldi"; speed:95.85 }
+        ListElement { speedTrap:18; driver:"Stewart"; speed:98.85 }
+        ListElement { speedTrap:19; driver:"Hunt"; speed:169.87 }
+        ListElement { speedTrap:19; driver:"Stewart"; speed:167.87 }
+        ListElement { speedTrap:19; driver:"Fittipaldi"; speed:154.87 }
+}
diff --git a/examples/charts/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml b/examples/charts/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml
deleted file mode 100644
index d871d37b..00000000
--- a/examples/charts/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Charts module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick.XmlListModel 2.0
-
-//![1]
-XmlListModel {
-    // Hard-coded test data
-    xml: "<results><row><speedTrap>0</speedTrap><driver>Fittipaldi</driver><speed>104.12</speed></row>"
-        +"<row><speedTrap>0</speedTrap><driver>Stewart</driver><speed>106.12</speed></row>"
-        +"<row><speedTrap>0</speedTrap><driver>Hunt</driver><speed>106.12</speed></row>"
-//![1]
-        +"<row><speedTrap>1</speedTrap><driver>Fittipaldi</driver><speed>115.12</speed></row>"
-        +"<row><speedTrap>1</speedTrap><driver>Stewart</driver><speed>114.12</speed></row>"
-        +"<row><speedTrap>1</speedTrap><driver>Hunt</driver><speed>115.12</speed></row>"
-        +"<row><speedTrap>2</speedTrap><driver>Hunt</driver><speed>165.23</speed></row>"
-        +"<row><speedTrap>2</speedTrap><driver>Fittipaldi</driver><speed>175.23</speed></row>"
-        +"<row><speedTrap>2</speedTrap><driver>Stewart</driver><speed>168.23</speed></row>"
-        +"<row><speedTrap>3</speedTrap><driver>Hunt</driver><speed>104.87</speed></row>"
-        +"<row><speedTrap>3</speedTrap><driver>Fittipaldi</driver><speed>104.43</speed></row>"
-        +"<row><speedTrap>3</speedTrap><driver>Stewart</driver><speed>94.83</speed></row>"
-        +"<row><speedTrap>4</speedTrap><driver>Hunt</driver><speed>107.87</speed></row>"
-        +"<row><speedTrap>4</speedTrap><driver>Fittipaldi</driver><speed>111.84</speed></row>"
-        +"<row><speedTrap>4</speedTrap><driver>Stewart</driver><speed>106.84</speed></row>"
-        +"<row><speedTrap>5</speedTrap><driver>Hunt</driver><speed>94.87</speed></row>"
-        +"<row><speedTrap>5</speedTrap><driver>Stewart</driver><speed>92.37</speed></row>"
-        +"<row><speedTrap>5</speedTrap><driver>Fittipaldi</driver><speed>99.37</speed></row>"
-        +"<row><speedTrap>6</speedTrap><driver>Hunt</driver><speed>52.87</speed></row>"
-        +"<row><speedTrap>6</speedTrap><driver>Fittipaldi</driver><speed>42.87</speed></row>"
-        +"<row><speedTrap>6</speedTrap><driver>Stewart</driver><speed>55.87</speed></row>"
-        +"<row><speedTrap>7</speedTrap><driver>Hunt</driver><speed>77.87</speed></row>"
-        +"<row><speedTrap>7</speedTrap><driver>Fittipaldi</driver><speed>72.87</speed></row>"
-        +"<row><speedTrap>7</speedTrap><driver>Stewart</driver><speed>87.87</speed></row>"
-        +"<row><speedTrap>8</speedTrap><driver>Hunt</driver><speed>94.17</speed></row>"
-        +"<row><speedTrap>8</speedTrap><driver>Fittipaldi</driver><speed>98.17</speed></row>"
-        +"<row><speedTrap>8</speedTrap><driver>Stewart</driver><speed>84.17</speed></row>"
-        +"<row><speedTrap>9</speedTrap><driver>Hunt</driver><speed>91.87</speed></row>"
-        +"<row><speedTrap>9</speedTrap><driver>Fittipaldi</driver><speed>71.87</speed></row>"
-        +"<row><speedTrap>9</speedTrap><driver>Stewart</driver><speed>81.87</speed></row>"
-        +"<row><speedTrap>10</speedTrap><driver>Hunt</driver><speed>104.87</speed></row>"
-        +"<row><speedTrap>10</speedTrap><driver>Fittipaldi</driver><speed>115.87</speed></row>"
-        +"<row><speedTrap>10</speedTrap><driver>Stewart</driver><speed>119.87</speed></row>"
-        +"<row><speedTrap>11</speedTrap><driver>Hunt</driver><speed>162.87</speed></row>"
-        +"<row><speedTrap>11</speedTrap><driver>Fittipaldi</driver><speed>155.84</speed></row>"
-        +"<row><speedTrap>11</speedTrap><driver>Stewart</driver><speed>152.84</speed></row>"
-        +"<row><speedTrap>12</speedTrap><driver>Hunt</driver><speed>181.87</speed></row>"
-        +"<row><speedTrap>12</speedTrap><driver>Fittipaldi</driver><speed>161.85</speed></row>"
-        +"<row><speedTrap>12</speedTrap><driver>Stewart</driver><speed>167.85</speed></row>"
-        +"<row><speedTrap>13</speedTrap><driver>Hunt</driver><speed>155.87</speed></row>"
-        +"<row><speedTrap>13</speedTrap><driver>Fittipaldi</driver><speed>154.87</speed></row>"
-        +"<row><speedTrap>13</speedTrap><driver>Stewart</driver><speed>164.87</speed></row>"
-        +"<row><speedTrap>14</speedTrap><driver>Hunt</driver><speed>197.57</speed></row>"
-        +"<row><speedTrap>14</speedTrap><driver>Fittipaldi</driver><speed>187.54</speed></row>"
-        +"<row><speedTrap>14</speedTrap><driver>Stewart</driver><speed>180.54</speed></row>"
-        +"<row><speedTrap>15</speedTrap><driver>Fittipaldi</driver><speed>216.87</speed></row>"
-        +"<row><speedTrap>15</speedTrap><driver>Hunt</driver><speed>207.87</speed></row>"
-        +"<row><speedTrap>15</speedTrap><driver>Stewart</driver><speed>197.87</speed></row>"
-        +"<row><speedTrap>16</speedTrap><driver>Hunt</driver><speed>82.87</speed></row>"
-        +"<row><speedTrap>16</speedTrap><driver>Fittipaldi</driver><speed>79.37</speed></row>"
-        +"<row><speedTrap>16</speedTrap><driver>Stewart</driver><speed>85.37</speed></row>"
-        +"<row><speedTrap>17</speedTrap><driver>Hunt</driver><speed>153.87</speed></row>"
-        +"<row><speedTrap>17</speedTrap><driver>Fittipaldi</driver><speed>143.87</speed></row>"
-        +"<row><speedTrap>17</speedTrap><driver>Stewart</driver><speed>133.87</speed></row>"
-        +"<row><speedTrap>18</speedTrap><driver>Hunt</driver><speed>89.87</speed></row>"
-        +"<row><speedTrap>18</speedTrap><driver>Fittipaldi</driver><speed>95.85</speed></row>"
-        +"<row><speedTrap>18</speedTrap><driver>Stewart</driver><speed>98.85</speed></row>"
-        +"<row><speedTrap>19</speedTrap><driver>Hunt</driver><speed>169.87</speed></row>"
-        +"<row><speedTrap>19</speedTrap><driver>Stewart</driver><speed>167.87</speed></row>"
-        +"<row><speedTrap>19</speedTrap><driver>Fittipaldi</driver><speed>154.87</speed></row>"
-        +"</results>"
-//![2]
-    query: "/results/row"
-
-    XmlRole { name: "speedTrap"; query: "speedTrap/string()" }
-    XmlRole { name: "driver"; query: "driver/string()" }
-    XmlRole { name: "speed"; query: "speed/string()" }
-}
-//![2]
diff --git a/examples/charts/qmlf1legends/qml/qmlf1legends/main.qml b/examples/charts/qmlf1legends/qml/qmlf1legends/main.qml
index c52722f0..1769cefa 100644
--- a/examples/charts/qmlf1legends/qml/qmlf1legends/main.qml
+++ b/examples/charts/qmlf1legends/qml/qmlf1legends/main.qml
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtCharts 2.0
-import QtQuick.XmlListModel 2.0
+import QtQuick
+import QtCharts
+import QtQml.Models
 
 Item {
     width: 400
@@ -48,13 +48,11 @@ Item {
     //![1]
 
     //![2]
-    // An example XmlListModel containing F1 legend drivers' speeds at speed traps
-    SpeedsXml {
-        id: speedsXml
-        onStatusChanged: {
-            if (status == XmlListModel.Ready) {
-                timer.start();
-            }
+    // An example ListModel containing F1 legend drivers' speeds at speed traps
+    SpeedsList {
+        id: speedsList
+        Component.onCompleted: {
+            timer.start();
         }
     }
     //![2]
@@ -69,13 +67,13 @@ Item {
         running: false
         onTriggered: {
             currentIndex++;
-            if (currentIndex < speedsXml.count) {
+            if (currentIndex < speedsList.count) {
                 // Check if there is a series for the data already
                 // (we are using driver name to identify series)
-                var lineSeries = chartView.series(speedsXml.get(currentIndex).driver);
+                var lineSeries = chartView.series(speedsList.get(currentIndex).driver);
                 if (!lineSeries) {
                     lineSeries = chartView.createSeries(ChartView.SeriesTypeLine,
-                                                        speedsXml.get(currentIndex).driver);
+                                                        speedsList.get(currentIndex).driver);
                     chartView.axisY().min = 0;
                     chartView.axisY().max = 250;
                     chartView.axisY().tickCount = 6;
@@ -83,11 +81,11 @@ Item {
                     chartView.axisX().titleText = "speed trap";
                     chartView.axisX().labelFormat = "%.0f";
                 }
-                lineSeries.append(speedsXml.get(currentIndex).speedTrap,
-                                  speedsXml.get(currentIndex).speed);
+                lineSeries.append(speedsList.get(currentIndex).speedTrap,
+                                  speedsList.get(currentIndex).speed);
 
-                if (speedsXml.get(currentIndex).speedTrap > 3) {
-                    chartView.axisX().max = Number(speedsXml.get(currentIndex).speedTrap) + 1;
+                if (speedsList.get(currentIndex).speedTrap > 3) {
+                    chartView.axisX().max = Number(speedsList.get(currentIndex).speedTrap) + 1;
                     chartView.axisX().min = chartView.axisX().max - 5;
                 } else {
                     chartView.axisX().max = 5;
@@ -99,7 +97,7 @@ Item {
                 timer.stop();
                 chartView.animationOptions = ChartView.AllAnimations;
                 chartView.axisX().min = 0;
-                chartView.axisX().max = speedsXml.get(currentIndex - 1).speedTrap;
+                chartView.axisX().max = speedsList.get(currentIndex - 1).speedTrap;
             }
         }
     }
diff --git a/examples/charts/qmlf1legends/resources.qrc b/examples/charts/qmlf1legends/resources.qrc
index 2a89c915..e9c9f29a 100644
--- a/examples/charts/qmlf1legends/resources.qrc
+++ b/examples/charts/qmlf1legends/resources.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>qml/qmlf1legends/main.qml</file>
-        <file>qml/qmlf1legends/SpeedsXml.qml</file>
+        <file>qml/qmlf1legends/SpeedsList.qml</file>
     </qresource>
 </RCC>