From 403cc617a116d73e54bb982314054fb72bbb974a Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 1 Sep 2021 16:53:49 +0200 Subject: Fix delegatechooser example to use QML modules We need to rephrase the image source selection due to ListElement only accepting literals. We can't just poke into the qrc file system of the "shared" module without importing it. Change-Id: I54d3fa4daf304afc9a0a55ab8b590d9c5ad20aa2 Reviewed-by: Fabian Kosmale (cherry picked from commit 485416c9d57e8ff8fe4fc0f7f4a3c4fdeaf35e98) Reviewed-by: Qt Cherry-pick Bot --- examples/quick/delegatechooser/delegatechooser.qml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'examples/quick/delegatechooser/delegatechooser.qml') diff --git a/examples/quick/delegatechooser/delegatechooser.qml b/examples/quick/delegatechooser/delegatechooser.qml index afb8518abf..75ab363d05 100644 --- a/examples/quick/delegatechooser/delegatechooser.qml +++ b/examples/quick/delegatechooser/delegatechooser.qml @@ -52,6 +52,7 @@ import QtQuick 2.12 import QtQml.Models 2.12 import QtQuick.Layouts 1.12 import Qt.labs.qmlmodels 1.0 +import shared Rectangle { visible: true @@ -61,9 +62,9 @@ Rectangle { ListModel { id: listModel ListElement { dataType: "rect"; color: "green" } - ListElement { dataType: "image"; source: "../shared/images/qt-logo.png" } + ListElement { dataType: "image" } ListElement { dataType: "rect"; color: "green" } - ListElement { dataType: "image"; source: "../shared/images/qt-logo.png" } + ListElement { dataType: "image" } ListElement { dataType: "rect"; color: "blue" } ListElement { dataType: "rect"; color: "blue" } ListElement { dataType: "rect"; color: "blue" } @@ -77,9 +78,9 @@ Rectangle { ListElement { dataType: "rect"; color: "blue" } ListElement { dataType: "rect"; color: "blue" } ListElement { dataType: "rect"; color: "green" } - ListElement { dataType: "image"; source: "../shared/images/qt-logo.png" } + ListElement { dataType: "image" } ListElement { dataType: "rect"; color: "green" } - ListElement { dataType: "image"; source: "../shared/images/qt-logo.png" } + ListElement { dataType: "image" } ListElement { dataType: "rect"; color: "blue" } ListElement { dataType: "rect"; color: "lightsteelblue" } ListElement { dataType: "rect"; color: "fuchsia" } @@ -118,7 +119,7 @@ Rectangle { delegate: Image { width: parent.width height: 100 - source: model.source + source: Images.qtLogo fillMode: Image.PreserveAspectFit } } -- cgit v1.2.3