summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-06-23 14:53:35 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-01 08:22:38 +0000
commit42a47f9ab397de4476eb5c91194d03fa95bb5c37 (patch)
tree26402da49efc178ecba00e31a6c03f2d1944c67c
parentf2b16cb7c1583f4563ecbdb99ee7c426d6691140 (diff)
Remove QML import versions from QtSensor examples
QML import versioning is optional and often unnecessary in Qt 6. Task-number: QTBUG-92505 Change-Id: I60acf84d8c75560396b896597b143dad283a2e5b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 763b64cca21817af24d944d631c0fb676da8ba23) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/sensors/accelbubble/accelbubble.qml6
-rw-r--r--examples/sensors/grue/grue.qml6
-rw-r--r--examples/sensors/maze/Congratulation.qml2
-rw-r--r--examples/sensors/maze/LabyrinthSquare.qml2
-rw-r--r--examples/sensors/maze/Mouse.qml2
-rw-r--r--examples/sensors/maze/components/ApplicationWindow.qml2
-rw-r--r--examples/sensors/maze/components/Button.qml2
-rw-r--r--examples/sensors/maze/maze.qml4
-rw-r--r--examples/sensors/qmlqtsensors/components/ApplicationWindow.qml2
-rw-r--r--examples/sensors/qmlqtsensors/components/Button.qml2
-rw-r--r--examples/sensors/qmlqtsensors/components/Divider.qml2
-rw-r--r--examples/sensors/qmlqtsensors/qmlqtsensors.qml4
-rw-r--r--examples/sensors/qmlsensorgestures/Button.qml2
-rw-r--r--examples/sensors/qmlsensorgestures/GestureList.qml4
-rw-r--r--examples/sensors/qmlsensorgestures/GestureView.qml4
-rw-r--r--examples/sensors/qmlsensorgestures/GesturesView.qml4
-rw-r--r--examples/sensors/qmlsensorgestures/qmlsensorgestures.qml4
-rw-r--r--examples/sensors/shakeit/shakeit.qml6
18 files changed, 30 insertions, 30 deletions
diff --git a/examples/sensors/accelbubble/accelbubble.qml b/examples/sensors/accelbubble/accelbubble.qml
index a980033f..57f499d1 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 02b1bd0f..faaed34f 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 3288e3a3..9d031d12 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 dab6d7ca..692d4322 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 cf839910..e3ffa2f5 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 5a1c9f67..348112a7 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 c7a05251..59c0f9c2 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 05ac9559..e5b4b0fe 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 54d837b2..d238627c 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 c7a05251..59c0f9c2 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 68d78ae9..50e57710 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 456c0140..0b473afc 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 56430f1b..015d8999 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 8ee1f6ed..a43ae11b 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 eaa46cd8..36039e8c 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 3ba53546..593b5c21 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 02d9e0cf..db8b263b 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 b5d5b499..6ea44979 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