Port photoviewer's XmlListModel away from QtXmlPatterns

Remove the qtxmlpatterns dependendency of photoviewer demo and reimplement XmlListModel class to use QXmlStreamReader instead of XPath/XQuery to query Xml.

Fixes: QTBUG-88058
Change-Id: If21f3f361c8154bc56d94f37263801b33af8906f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

9 files changed, 20 insertions, 33 deletions

diff --git a/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index 6b654377a..0d9d52828 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.XmlListModel 2.0
-import QtQml.Models 2.1
+import QtQuick
+import XmlListModel
+import QtQml.Models
 
 Component {
     id: albumDelegate
diff --git a/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
index 17a7b0d8d..f60cca8c8 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Image {
     id: container
diff --git a/examples/demos/photoviewer/PhotoViewerCore/Button.qml b/examples/demos/photoviewer/PhotoViewerCore/Button.qml
index 8744dc2e7..401c35c7d 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/Button.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/Button.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Item {
     id: container
diff --git a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
index 2df47c063..82f1679de 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Item {
     id: container
diff --git a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index b3652701e..6d02e8708 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "script/script.mjs" as Script
 
 Package {
@@ -79,8 +79,8 @@ Package {
             Rectangle {
                 id: placeHolder
 
-                property int w: Script.getWidth(content)
-                property int h: Script.getHeight(content)
+                property int w: 400
+                property int h: 400
                 property double s: Script.calculateScale(w, h, photoWrapper.width)
 
                 color: 'white'; anchors.centerIn: parent; antialiasing: true
@@ -98,7 +98,7 @@ Package {
             BusyIndicator { anchors.centerIn: parent; on: originalImage.status != Image.Ready }
             Image {
                 id: originalImage; antialiasing: true;
-                source: "http://" + Script.getImagePath(content); cache: false
+                source: link; cache: false
                 fillMode: Image.PreserveAspectFit; width: photoWrapper.width; height: photoWrapper.height
             }
             Image {
@@ -143,7 +143,7 @@ Package {
                     width: mainWindow.width; height: mainWindow.height
                 }
                 PropertyChanges { target: border; opacity: 0 }
-                PropertyChanges { target: hqImage; source: listItem.ListView.isCurrentItem ? hq : ""; visible: true }
+                PropertyChanges { target: hqImage; source: listItem.ListView.isCurrentItem ? link : ""; visible: true }
             }
             ]
 
diff --git a/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
index ee21eb6fc..4b0a5dc73 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Item {
     id: container
diff --git a/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml b/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml
index c19888a40..5fb1cce4e 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.XmlListModel 2.0
+import QtQuick
+import XmlListModel
 
 XmlListModel {
     property string tags : ""
@@ -57,10 +57,11 @@ XmlListModel {
     function encodeTags(x) { return encodeURIComponent(x.replace(' ',',')); }
 
     source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+encodeTags(tags)+"&" : "")
+
     query: "/feed/entry"
-    namespaceDeclarations: "declare default element namespace 'http://www.w3.org/2005/Atom';"
 
-    XmlRole { name: "title"; query: "title/string()" }
-    XmlRole { name: "content"; query: "content/string()" }
-    XmlRole { name: "hq"; query: "link[@rel='enclosure']/@href/string()" }
+    roles: [
+        XmlListModelRole { elementName: "title"; attributeName: "" },
+        XmlListModelRole { elementName: "link"; attributeName: "href" }
+    ]
 }
diff --git a/examples/demos/photoviewer/PhotoViewerCore/Tag.qml b/examples/demos/photoviewer/PhotoViewerCore/Tag.qml
index bc12d81a9..bdeb02135 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/Tag.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/Tag.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Flipable {
     id: flipable
diff --git a/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs b/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs
index a1822197b..0a33a725d 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs
+++ b/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs
@@ -48,20 +48,6 @@
 **
 ****************************************************************************/
 
-export function getWidth(string) {
-    return (string.match(/width=\"([0-9]+)\"/))[1]
-}
-
-export function getHeight(string) {
-    return (string.match(/height=\"([0-9]+)\"/))[1]
-}
-
-export function getImagePath(string) {
-    var pattern = /src=\"https?:\/\/(\S+)\"/
-    var match = string.match(pattern)
-    return match ? match[1] : ""
-}
-
 export function calculateScale(width, height, cellSize) {
     var widthScale = (cellSize * 1.0) / width
     var heightScale = (cellSize * 1.0) / height