From d42770a9fda2e00617e6f4c2452156b9b9cafd03 Mon Sep 17 00:00:00 2001 From: Balazs Egedi Date: Wed, 18 Aug 2021 16:40:52 +0200 Subject: Fix QML files in tests and examples - Removed the import versions - Changed the implicitly defined properties in Connections - Ported qmls to Qt6 - Dialog icon support is incomplete, so no icon in Dialog for now Pick-to: 6.2 Pick-to: 6.2.0 Change-Id: I2dab3a0e715d447004aa408476bcfd638599b012 Reviewed-by: Arno Rehn --- tests/auto/qml/Client.qml | 8 ++++---- tests/auto/qml/tst_bench.qml | 8 ++++---- tests/auto/qml/tst_multiclient.qml | 8 ++++---- tests/auto/qml/tst_webchannel.qml | 8 ++++---- tests/auto/qml/tst_webchannelseparation.qml | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'tests/auto/qml') diff --git a/tests/auto/qml/Client.qml b/tests/auto/qml/Client.qml index 269c8fb..9543818 100644 --- a/tests/auto/qml/Client.qml +++ b/tests/auto/qml/Client.qml @@ -26,11 +26,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 +import QtQuick +import QtTest -import QtWebChannel 1.0 -import QtWebChannel.Tests 1.0 +import QtWebChannel +import QtWebChannel.Tests import "qrc:///qtwebchannel/qwebchannel.js" as JSClient Item { diff --git a/tests/auto/qml/tst_bench.qml b/tests/auto/qml/tst_bench.qml index bd337f8..b8ac0df 100644 --- a/tests/auto/qml/tst_bench.qml +++ b/tests/auto/qml/tst_bench.qml @@ -26,11 +26,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 +import QtQuick +import QtTest -import QtWebChannel 1.0 -import QtWebChannel.Tests 1.0 +import QtWebChannel +import QtWebChannel.Tests TestCase { name: "Bench" diff --git a/tests/auto/qml/tst_multiclient.qml b/tests/auto/qml/tst_multiclient.qml index fbebeda..c175c59 100644 --- a/tests/auto/qml/tst_multiclient.qml +++ b/tests/auto/qml/tst_multiclient.qml @@ -27,11 +27,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 +import QtQuick +import QtTest -import QtWebChannel 1.0 -import QtWebChannel.Tests 1.0 +import QtWebChannel +import QtWebChannel.Tests import "qrc:///qtwebchannel/qwebchannel.js" as JSClient diff --git a/tests/auto/qml/tst_webchannel.qml b/tests/auto/qml/tst_webchannel.qml index 05a3f30..fe62542 100644 --- a/tests/auto/qml/tst_webchannel.qml +++ b/tests/auto/qml/tst_webchannel.qml @@ -26,11 +26,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 +import QtQuick +import QtTest -import QtWebChannel 1.0 -import QtWebChannel.Tests 1.0 +import QtWebChannel +import QtWebChannel.Tests import "qrc:///qtwebchannel/qwebchannel.js" as JSClient TestCase { diff --git a/tests/auto/qml/tst_webchannelseparation.qml b/tests/auto/qml/tst_webchannelseparation.qml index 64ad4f8..a0632b3 100644 --- a/tests/auto/qml/tst_webchannelseparation.qml +++ b/tests/auto/qml/tst_webchannelseparation.qml @@ -25,11 +25,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 +import QtQuick +import QtTest -import QtWebChannel 1.0 -import QtWebChannel.Tests 1.0 +import QtWebChannel +import QtWebChannel.Tests import "qrc:///qtwebchannel/qwebchannel.js" as JSClient TestCase { -- cgit v1.2.1