aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2021-10-26 20:11:41 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2021-10-27 12:35:15 +0000
commitcc18223e0b7bb6677e649ffa42b043d327f9c7f3 (patch)
treec5730f003d3aa7aadb048b9fdb9d89c677a224ca
parent21f15ede606df028479335c64c333db5fb1bb3f7 (diff)
Remove import versions from qml files in the pointerhandlers example
Many of these are portable to Qt 5; but we don't need the version numbers in Qt 6, and the components that use "palette" refer to Item.palette, which was added in Qt 6. Pick-to: 6.2 Change-Id: Ic799fba5dd66db51a8808c52dce01d27c6da62bb Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--examples/quick/pointerhandlers/components/FakeFlickable.qml4
-rw-r--r--examples/quick/pointerhandlers/components/FlashAnimation.qml2
-rw-r--r--examples/quick/pointerhandlers/components/MomentumAnimation.qml2
-rw-r--r--examples/quick/pointerhandlers/components/MouseFeedbackSprite.qml2
-rw-r--r--examples/quick/pointerhandlers/components/ScrollBar.qml2
-rw-r--r--examples/quick/pointerhandlers/components/TouchpointFeedbackSprite.qml2
-rw-r--r--examples/quick/pointerhandlers/fakeFlickable.qml2
-rw-r--r--examples/quick/pointerhandlers/flingAnimation.qml2
-rw-r--r--examples/quick/pointerhandlers/joystick.qml2
-rw-r--r--examples/quick/pointerhandlers/mixer.qml2
-rw-r--r--examples/quick/pointerhandlers/pinchHandler.qml2
-rw-r--r--examples/quick/pointerhandlers/sidebar.qml2
-rw-r--r--examples/quick/pointerhandlers/singlePointHandlerProperties.qml2
-rw-r--r--examples/quick/pointerhandlers/tabletCanvasDrawing.qml4
-rw-r--r--examples/quick/pointerhandlers/tapWithModifiers.qml2
15 files changed, 17 insertions, 17 deletions
diff --git a/examples/quick/pointerhandlers/components/FakeFlickable.qml b/examples/quick/pointerhandlers/components/FakeFlickable.qml
index 2857d066aa..5e652e4e68 100644
--- a/examples/quick/pointerhandlers/components/FakeFlickable.qml
+++ b/examples/quick/pointerhandlers/components/FakeFlickable.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.14
-import Qt.labs.animation 1.0
+import QtQuick
+import Qt.labs.animation
Item {
id: root
diff --git a/examples/quick/pointerhandlers/components/FlashAnimation.qml b/examples/quick/pointerhandlers/components/FlashAnimation.qml
index 047112d22c..b0dd7836ae 100644
--- a/examples/quick/pointerhandlers/components/FlashAnimation.qml
+++ b/examples/quick/pointerhandlers/components/FlashAnimation.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
SequentialAnimation {
id: tapFlash
diff --git a/examples/quick/pointerhandlers/components/MomentumAnimation.qml b/examples/quick/pointerhandlers/components/MomentumAnimation.qml
index 03e1689317..a19d41c83f 100644
--- a/examples/quick/pointerhandlers/components/MomentumAnimation.qml
+++ b/examples/quick/pointerhandlers/components/MomentumAnimation.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
ParallelAnimation {
id: root
diff --git a/examples/quick/pointerhandlers/components/MouseFeedbackSprite.qml b/examples/quick/pointerhandlers/components/MouseFeedbackSprite.qml
index 4d6f1843c8..0fa2db3aa7 100644
--- a/examples/quick/pointerhandlers/components/MouseFeedbackSprite.qml
+++ b/examples/quick/pointerhandlers/components/MouseFeedbackSprite.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
PointHandler {
id: handler
diff --git a/examples/quick/pointerhandlers/components/ScrollBar.qml b/examples/quick/pointerhandlers/components/ScrollBar.qml
index f5cf27a0c5..0ed720eca0 100644
--- a/examples/quick/pointerhandlers/components/ScrollBar.qml
+++ b/examples/quick/pointerhandlers/components/ScrollBar.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
Rectangle {
id: root
diff --git a/examples/quick/pointerhandlers/components/TouchpointFeedbackSprite.qml b/examples/quick/pointerhandlers/components/TouchpointFeedbackSprite.qml
index 5a4f258b8c..d8e76c1046 100644
--- a/examples/quick/pointerhandlers/components/TouchpointFeedbackSprite.qml
+++ b/examples/quick/pointerhandlers/components/TouchpointFeedbackSprite.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
PointHandler {
id: handler
diff --git a/examples/quick/pointerhandlers/fakeFlickable.qml b/examples/quick/pointerhandlers/fakeFlickable.qml
index a601a5fbae..152915b97e 100644
--- a/examples/quick/pointerhandlers/fakeFlickable.qml
+++ b/examples/quick/pointerhandlers/fakeFlickable.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "components"
Rectangle {
diff --git a/examples/quick/pointerhandlers/flingAnimation.qml b/examples/quick/pointerhandlers/flingAnimation.qml
index a2a6a0acd1..d3231ffc41 100644
--- a/examples/quick/pointerhandlers/flingAnimation.qml
+++ b/examples/quick/pointerhandlers/flingAnimation.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "components"
Rectangle {
diff --git a/examples/quick/pointerhandlers/joystick.qml b/examples/quick/pointerhandlers/joystick.qml
index c0445a5e21..5433bf8be9 100644
--- a/examples/quick/pointerhandlers/joystick.qml
+++ b/examples/quick/pointerhandlers/joystick.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
Item {
width: image.implicitWidth; height: image.implicitHeight
diff --git a/examples/quick/pointerhandlers/mixer.qml b/examples/quick/pointerhandlers/mixer.qml
index 39cc2974d7..73a39c58f2 100644
--- a/examples/quick/pointerhandlers/mixer.qml
+++ b/examples/quick/pointerhandlers/mixer.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "components"
Rectangle {
diff --git a/examples/quick/pointerhandlers/pinchHandler.qml b/examples/quick/pointerhandlers/pinchHandler.qml
index a4477b0af0..74f0bd5209 100644
--- a/examples/quick/pointerhandlers/pinchHandler.qml
+++ b/examples/quick/pointerhandlers/pinchHandler.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "components"
Rectangle {
diff --git a/examples/quick/pointerhandlers/sidebar.qml b/examples/quick/pointerhandlers/sidebar.qml
index 60c781d46f..7406931b28 100644
--- a/examples/quick/pointerhandlers/sidebar.qml
+++ b/examples/quick/pointerhandlers/sidebar.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.15
+import QtQuick
import "components"
Rectangle {
diff --git a/examples/quick/pointerhandlers/singlePointHandlerProperties.qml b/examples/quick/pointerhandlers/singlePointHandlerProperties.qml
index 177e8eaaf5..a04bf0fe6c 100644
--- a/examples/quick/pointerhandlers/singlePointHandlerProperties.qml
+++ b/examples/quick/pointerhandlers/singlePointHandlerProperties.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
Rectangle {
id: root
diff --git a/examples/quick/pointerhandlers/tabletCanvasDrawing.qml b/examples/quick/pointerhandlers/tabletCanvasDrawing.qml
index 5c19bab31a..36630f16aa 100644
--- a/examples/quick/pointerhandlers/tabletCanvasDrawing.qml
+++ b/examples/quick/pointerhandlers/tabletCanvasDrawing.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
import "components"
Rectangle {
diff --git a/examples/quick/pointerhandlers/tapWithModifiers.qml b/examples/quick/pointerhandlers/tapWithModifiers.qml
index 86b66512da..a38be819be 100644
--- a/examples/quick/pointerhandlers/tapWithModifiers.qml
+++ b/examples/quick/pointerhandlers/tapWithModifiers.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
Item {
width: 200