From 763b64cca21817af24d944d631c0fb676da8ba23 Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Wed, 23 Jun 2021 14:53:35 +0300 Subject: Remove QML import versions from QtSensor examples QML import versioning is optional and often unnecessary in Qt 6. Pick-to: 6.2 Task-number: QTBUG-92505 Change-Id: I60acf84d8c75560396b896597b143dad283a2e5b Reviewed-by: Ulf Hermann --- examples/sensors/accelbubble/accelbubble.qml | 6 +++--- examples/sensors/grue/grue.qml | 6 +++--- examples/sensors/maze/Congratulation.qml | 2 +- examples/sensors/maze/LabyrinthSquare.qml | 2 +- examples/sensors/maze/Mouse.qml | 2 +- examples/sensors/maze/components/ApplicationWindow.qml | 2 +- examples/sensors/maze/components/Button.qml | 2 +- examples/sensors/maze/maze.qml | 4 ++-- examples/sensors/qmlqtsensors/components/ApplicationWindow.qml | 2 +- examples/sensors/qmlqtsensors/components/Button.qml | 2 +- examples/sensors/qmlqtsensors/components/Divider.qml | 2 +- examples/sensors/qmlqtsensors/qmlqtsensors.qml | 4 ++-- examples/sensors/qmlsensorgestures/Button.qml | 2 +- examples/sensors/qmlsensorgestures/GestureList.qml | 4 ++-- examples/sensors/qmlsensorgestures/GestureView.qml | 4 ++-- examples/sensors/qmlsensorgestures/GesturesView.qml | 4 ++-- examples/sensors/qmlsensorgestures/qmlsensorgestures.qml | 4 ++-- examples/sensors/shakeit/shakeit.qml | 6 +++--- 18 files changed, 30 insertions(+), 30 deletions(-) (limited to 'examples') diff --git a/examples/sensors/accelbubble/accelbubble.qml b/examples/sensors/accelbubble/accelbubble.qml index a980033..57f499d 100644 --- a/examples/sensors/accelbubble/accelbubble.qml +++ b/examples/sensors/accelbubble/accelbubble.qml @@ -49,11 +49,11 @@ ****************************************************************************/ -import QtQuick 2.1 -import QtQuick.Controls 2.0 +import QtQuick +import QtQuick.Controls //! [0] -import QtSensors 5.0 +import QtSensors //! [0] diff --git a/examples/sensors/grue/grue.qml b/examples/sensors/grue/grue.qml index 02b1bd0..faaed34 100644 --- a/examples/sensors/grue/grue.qml +++ b/examples/sensors/grue/grue.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtSensors 5.0 -import Grue 1.0 +import QtQuick +import QtSensors +import Grue Rectangle { id: root diff --git a/examples/sensors/maze/Congratulation.qml b/examples/sensors/maze/Congratulation.qml index 3288e3a..9d031d1 100644 --- a/examples/sensors/maze/Congratulation.qml +++ b/examples/sensors/maze/Congratulation.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick //Import the javascript functions for this game import "lib.js" as Lib diff --git a/examples/sensors/maze/LabyrinthSquare.qml b/examples/sensors/maze/LabyrinthSquare.qml index dab6d7c..692d432 100644 --- a/examples/sensors/maze/LabyrinthSquare.qml +++ b/examples/sensors/maze/LabyrinthSquare.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick //Import the javascript functions for this game import "lib.js" as Lib diff --git a/examples/sensors/maze/Mouse.qml b/examples/sensors/maze/Mouse.qml index cf83991..e3ffa2f 100644 --- a/examples/sensors/maze/Mouse.qml +++ b/examples/sensors/maze/Mouse.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick //Import the javascript functions for this game import "lib.js" as Lib diff --git a/examples/sensors/maze/components/ApplicationWindow.qml b/examples/sensors/maze/components/ApplicationWindow.qml index 5a1c9f6..348112a 100644 --- a/examples/sensors/maze/components/ApplicationWindow.qml +++ b/examples/sensors/maze/components/ApplicationWindow.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick Rectangle { id: appWnd diff --git a/examples/sensors/maze/components/Button.qml b/examples/sensors/maze/components/Button.qml index c7a0525..59c0f9c 100644 --- a/examples/sensors/maze/components/Button.qml +++ b/examples/sensors/maze/components/Button.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick //Implementation of the Button control. Item { diff --git a/examples/sensors/maze/maze.qml b/examples/sensors/maze/maze.qml index 05ac955..e5b4b0f 100644 --- a/examples/sensors/maze/maze.qml +++ b/examples/sensors/maze/maze.qml @@ -79,11 +79,11 @@ */ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick import "components" //! [0] -import QtSensors 5.0 +import QtSensors //! [0] //Import the javascript functions for this game diff --git a/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml b/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml index 54d837b..d238627 100644 --- a/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml +++ b/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick Rectangle { id: appWnd diff --git a/examples/sensors/qmlqtsensors/components/Button.qml b/examples/sensors/qmlqtsensors/components/Button.qml index c7a0525..59c0f9c 100644 --- a/examples/sensors/qmlqtsensors/components/Button.qml +++ b/examples/sensors/qmlqtsensors/components/Button.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick //Implementation of the Button control. Item { diff --git a/examples/sensors/qmlqtsensors/components/Divider.qml b/examples/sensors/qmlqtsensors/components/Divider.qml index 68d78ae..50e5771 100644 --- a/examples/sensors/qmlqtsensors/components/Divider.qml +++ b/examples/sensors/qmlqtsensors/components/Divider.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Column { spacing: 5 diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.qml b/examples/sensors/qmlqtsensors/qmlqtsensors.qml index 456c014..0b473af 100644 --- a/examples/sensors/qmlqtsensors/qmlqtsensors.qml +++ b/examples/sensors/qmlqtsensors/qmlqtsensors.qml @@ -94,11 +94,11 @@ */ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick import "components" //! [0] -import QtSensors 5.0 +import QtSensors //! [0] ApplicationWindow { diff --git a/examples/sensors/qmlsensorgestures/Button.qml b/examples/sensors/qmlsensorgestures/Button.qml index 56430f1..015d899 100644 --- a/examples/sensors/qmlsensorgestures/Button.qml +++ b/examples/sensors/qmlsensorgestures/Button.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick //Implementation of the Button control. Item { diff --git a/examples/sensors/qmlsensorgestures/GestureList.qml b/examples/sensors/qmlsensorgestures/GestureList.qml index 8ee1f6e..a43ae11 100644 --- a/examples/sensors/qmlsensorgestures/GestureList.qml +++ b/examples/sensors/qmlsensorgestures/GestureList.qml @@ -49,8 +49,8 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 -import QtSensors 5.0 +import QtQuick +import QtSensors /* Layout gesturerect diff --git a/examples/sensors/qmlsensorgestures/GestureView.qml b/examples/sensors/qmlsensorgestures/GestureView.qml index eaa46cd..36039e8 100644 --- a/examples/sensors/qmlsensorgestures/GestureView.qml +++ b/examples/sensors/qmlsensorgestures/GestureView.qml @@ -49,10 +49,10 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 +import QtQuick //! [0] -import QtSensors 5.0 +import QtSensors //! [0] /* Layout diff --git a/examples/sensors/qmlsensorgestures/GesturesView.qml b/examples/sensors/qmlsensorgestures/GesturesView.qml index 3ba5354..593b5c2 100644 --- a/examples/sensors/qmlsensorgestures/GesturesView.qml +++ b/examples/sensors/qmlsensorgestures/GesturesView.qml @@ -49,8 +49,8 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 -import QtSensors 5.0 +import QtQuick +import QtSensors /* Layout gesturerect diff --git a/examples/sensors/qmlsensorgestures/qmlsensorgestures.qml b/examples/sensors/qmlsensorgestures/qmlsensorgestures.qml index 02d9e0c..db8b263 100644 --- a/examples/sensors/qmlsensorgestures/qmlsensorgestures.qml +++ b/examples/sensors/qmlsensorgestures/qmlsensorgestures.qml @@ -49,8 +49,8 @@ ****************************************************************************/ //Import the declarative plugins -import QtQuick 2.0 -import QtSensors 5.0 +import QtQuick +import QtSensors /* Layout -------------------------------------------------- diff --git a/examples/sensors/shakeit/shakeit.qml b/examples/sensors/shakeit/shakeit.qml index b5d5b49..6ea4497 100644 --- a/examples/sensors/shakeit/shakeit.qml +++ b/examples/sensors/shakeit/shakeit.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick //! [0] -import QtSensors 5.0 +import QtSensors //! [0] -import QtMultimedia 5.0 +import QtMultimedia -- cgit v1.2.1