Get rid of Qt.labs.handlers import, merge into QtQuick 2.12

... and clean up imports in examples, snippets and tests accordingly.

Change-Id: I5bbe63afd2614cdc2c1ec7d179c9acd6bc03b167
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

32 files changed, 37 insertions, 61 deletions

diff --git a/tests/manual/mousearea/main.qml b/tests/manual/mousearea/main.qml
index 6c284c3586..9a3243b670 100644
--- a/tests/manual/mousearea/main.qml
+++ b/tests/manual/mousearea/main.qml
@@ -26,9 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick 2.12
 import QtQuick.Window 2.2
-import Qt.labs.handlers 1.0
 import "qrc:/quick/shared/" as Examples
 
 Window {
diff --git a/tests/manual/pointer/content/CheckBox.qml b/tests/manual/pointer/content/CheckBox.qml
index 477be56f05..3702457ee9 100644
--- a/tests/manual/pointer/content/CheckBox.qml
+++ b/tests/manual/pointer/content/CheckBox.qml
@@ -25,8 +25,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-import Qt.labs.handlers 1.0
+
+import QtQuick 2.12
 
 Row {
     id: root
diff --git a/tests/manual/pointer/content/FakeFlickable.qml b/tests/manual/pointer/content/FakeFlickable.qml
index dbcf48d2f7..5a20a6825a 100644
--- a/tests/manual/pointer/content/FakeFlickable.qml
+++ b/tests/manual/pointer/content/FakeFlickable.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 Item {
     id: root
diff --git a/tests/manual/pointer/content/FlashAnimation.qml b/tests/manual/pointer/content/FlashAnimation.qml
index 4b2935b52e..57817e9aee 100644
--- a/tests/manual/pointer/content/FlashAnimation.qml
+++ b/tests/manual/pointer/content/FlashAnimation.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 SequentialAnimation {
     id: tapFlash
diff --git a/tests/manual/pointer/content/MomentumAnimation.qml b/tests/manual/pointer/content/MomentumAnimation.qml
index bd21475970..ae42f906a1 100644
--- a/tests/manual/pointer/content/MomentumAnimation.qml
+++ b/tests/manual/pointer/content/MomentumAnimation.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick 2.12
 
 ParallelAnimation {
     id: root
diff --git a/tests/manual/pointer/content/MouseAreaButton.qml b/tests/manual/pointer/content/MouseAreaButton.qml
index 43337520a5..f75b8f9c56 100644
--- a/tests/manual/pointer/content/MouseAreaButton.qml
+++ b/tests/manual/pointer/content/MouseAreaButton.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
-import QtQuick.Window 2.1
+import QtQuick 2.12
+import QtQuick.Window 2.12
 
 Item {
     id: container
diff --git a/tests/manual/pointer/content/MouseAreaSlider.qml b/tests/manual/pointer/content/MouseAreaSlider.qml
index 4e2cfee6a9..e784e959b1 100644
--- a/tests/manual/pointer/content/MouseAreaSlider.qml
+++ b/tests/manual/pointer/content/MouseAreaSlider.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
+import QtQuick 2.12
 
 Item {
     id: root
diff --git a/tests/manual/pointer/content/MouseFeedbackSprite.qml b/tests/manual/pointer/content/MouseFeedbackSprite.qml
index c61a07b3ea..d3068ff503 100644
--- a/tests/manual/pointer/content/MouseFeedbackSprite.qml
+++ b/tests/manual/pointer/content/MouseFeedbackSprite.qml
@@ -48,8 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 PointHandler {
     id: handler
diff --git a/tests/manual/pointer/content/MptaButton.qml b/tests/manual/pointer/content/MptaButton.qml
index a35446632d..ed8702b9b3 100644
--- a/tests/manual/pointer/content/MptaButton.qml
+++ b/tests/manual/pointer/content/MptaButton.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Window 2.1
+import QtQuick 2.12
+import QtQuick.Window 2.12
 
 Item {
     id: container
diff --git a/tests/manual/pointer/content/MultiButton.qml b/tests/manual/pointer/content/MultiButton.qml
index ca9b16a957..485784a875 100644
--- a/tests/manual/pointer/content/MultiButton.qml
+++ b/tests/manual/pointer/content/MultiButton.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 Rectangle {
     id: root
diff --git a/tests/manual/pointer/content/ScrollBar.qml b/tests/manual/pointer/content/ScrollBar.qml
index e659c5d7af..9928433d1f 100644
--- a/tests/manual/pointer/content/ScrollBar.qml
+++ b/tests/manual/pointer/content/ScrollBar.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 Rectangle {
     id: root
diff --git a/tests/manual/pointer/content/Slider.qml b/tests/manual/pointer/content/Slider.qml
index 1741fb1bc6..c381d97c7c 100644
--- a/tests/manual/pointer/content/Slider.qml
+++ b/tests/manual/pointer/content/Slider.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 Item {
     id: root
diff --git a/tests/manual/pointer/content/TapHandlerButton.qml b/tests/manual/pointer/content/TapHandlerButton.qml
index 28187044c2..2dc1d78a6f 100644
--- a/tests/manual/pointer/content/TapHandlerButton.qml
+++ b/tests/manual/pointer/content/TapHandlerButton.qml
@@ -26,9 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Window 2.1
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
+import QtQuick.Window 2.12
 
 Item {
     id: container
diff --git a/tests/manual/pointer/content/TextBox.qml b/tests/manual/pointer/content/TextBox.qml
index 0fbfaf02e3..b59c21379f 100644
--- a/tests/manual/pointer/content/TextBox.qml
+++ b/tests/manual/pointer/content/TextBox.qml
@@ -25,7 +25,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
+
+import QtQuick 2.12
 
 Rectangle {
     id: r1
diff --git a/tests/manual/pointer/content/TouchpointFeedbackSprite.qml b/tests/manual/pointer/content/TouchpointFeedbackSprite.qml
index ffcead59d4..bee3b8b795 100644
--- a/tests/manual/pointer/content/TouchpointFeedbackSprite.qml
+++ b/tests/manual/pointer/content/TouchpointFeedbackSprite.qml
@@ -48,8 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 PointHandler {
     id: handler
diff --git a/tests/manual/pointer/fakeFlickable.qml b/tests/manual/pointer/fakeFlickable.qml
index bde378c33d..284e0d1f34 100644
--- a/tests/manual/pointer/fakeFlickable.qml
+++ b/tests/manual/pointer/fakeFlickable.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 import "content"
 
 Rectangle {
diff --git a/tests/manual/pointer/flickableWithHandlers.qml b/tests/manual/pointer/flickableWithHandlers.qml
index 28009a7024..08cedb9a16 100644
--- a/tests/manual/pointer/flickableWithHandlers.qml
+++ b/tests/manual/pointer/flickableWithHandlers.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 import "qrc:/quick/shared/" as Examples
 import "content"
 
diff --git a/tests/manual/pointer/flingAnimation.qml b/tests/manual/pointer/flingAnimation.qml
index 3b0d359530..b17429f4e4 100644
--- a/tests/manual/pointer/flingAnimation.qml
+++ b/tests/manual/pointer/flingAnimation.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 import "content"
 
 Rectangle {
diff --git a/tests/manual/pointer/joystick.qml b/tests/manual/pointer/joystick.qml
index f5be17ddc9..c8880f9100 100644
--- a/tests/manual/pointer/joystick.qml
+++ b/tests/manual/pointer/joystick.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 Item {
     width: image.implicitWidth; height: image.implicitHeight
diff --git a/tests/manual/pointer/main.qml b/tests/manual/pointer/main.qml
index bd9097c517..f6659da220 100644
--- a/tests/manual/pointer/main.qml
+++ b/tests/manual/pointer/main.qml
@@ -26,10 +26,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Window 2.2
+import QtQuick 2.12
+import QtQuick.Window 2.12
 import QtQuick.Layouts 1.2
-import Qt.labs.handlers 1.0
 import org.qtproject.Test 1.0
 import "qrc:/quick/shared/" as Examples
 import "content"
diff --git a/tests/manual/pointer/map.qml b/tests/manual/pointer/map.qml
index 880f184adb..ae7ec042d3 100644
--- a/tests/manual/pointer/map.qml
+++ b/tests/manual/pointer/map.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 Item {
     width: 640
diff --git a/tests/manual/pointer/map2.qml b/tests/manual/pointer/map2.qml
index 4d8755b996..0f45013e92 100644
--- a/tests/manual/pointer/map2.qml
+++ b/tests/manual/pointer/map2.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 Item {
     width: 640
diff --git a/tests/manual/pointer/mixer.qml b/tests/manual/pointer/mixer.qml
index 64c4b102d1..6044b59633 100644
--- a/tests/manual/pointer/mixer.qml
+++ b/tests/manual/pointer/mixer.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 import "content"
 
 Rectangle {
diff --git a/tests/manual/pointer/multibuttons.qml b/tests/manual/pointer/multibuttons.qml
index 28c3cc0f50..d143134a3a 100644
--- a/tests/manual/pointer/multibuttons.qml
+++ b/tests/manual/pointer/multibuttons.qml
@@ -26,10 +26,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 import QtQuick.Particles 2.0
 import QtQuick.Layouts 1.0
-import Qt.labs.handlers 1.0
 import "content"
 
 Item {
diff --git a/tests/manual/pointer/photosurface.qml b/tests/manual/pointer/photosurface.qml
index 04aef538f9..57ad12788e 100644
--- a/tests/manual/pointer/photosurface.qml
+++ b/tests/manual/pointer/photosurface.qml
@@ -26,10 +26,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick 2.12
 import QtQuick.Dialogs 1.0
 import Qt.labs.folderlistmodel 1.0
-import Qt.labs.handlers 1.0
 import "content"
 
 Rectangle {
diff --git a/tests/manual/pointer/pinchDragFlingMPTA.qml b/tests/manual/pointer/pinchDragFlingMPTA.qml
index 0362832662..b68c6cb8c1 100644
--- a/tests/manual/pointer/pinchDragFlingMPTA.qml
+++ b/tests/manual/pointer/pinchDragFlingMPTA.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 import "content"
 
 Rectangle {
diff --git a/tests/manual/pointer/pinchHandler.qml b/tests/manual/pointer/pinchHandler.qml
index 36af1f53bd..8ef6623f7f 100644
--- a/tests/manual/pointer/pinchHandler.qml
+++ b/tests/manual/pointer/pinchHandler.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 import "content"
 
 Rectangle {
diff --git a/tests/manual/pointer/pointerDrag.qml b/tests/manual/pointer/pointerDrag.qml
index f3fbe66339..79044eb0b4 100644
--- a/tests/manual/pointer/pointerDrag.qml
+++ b/tests/manual/pointer/pointerDrag.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 import "content"
 
 Rectangle {
diff --git a/tests/manual/pointer/sidebar.qml b/tests/manual/pointer/sidebar.qml
index ce2c770592..827dbd1980 100644
--- a/tests/manual/pointer/sidebar.qml
+++ b/tests/manual/pointer/sidebar.qml
@@ -27,7 +27,6 @@
 ****************************************************************************/
 
 import QtQuick 2.12
-import Qt.labs.handlers 1.0
 import "content"
 
 Rectangle {
diff --git a/tests/manual/pointer/singlePointHandlerProperties.qml b/tests/manual/pointer/singlePointHandlerProperties.qml
index 1c044f8167..40a4f49e5e 100644
--- a/tests/manual/pointer/singlePointHandlerProperties.qml
+++ b/tests/manual/pointer/singlePointHandlerProperties.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 Rectangle {
     id: root
diff --git a/tests/manual/pointer/tapHandler.qml b/tests/manual/pointer/tapHandler.qml
index 94777c268c..08cf987293 100644
--- a/tests/manual/pointer/tapHandler.qml
+++ b/tests/manual/pointer/tapHandler.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 import "qrc:/quick/shared/" as Examples
 
 Item {
diff --git a/tests/manual/pointer/tapWithModifiers.qml b/tests/manual/pointer/tapWithModifiers.qml
index 74db33125d..8ca1c1bd63 100644
--- a/tests/manual/pointer/tapWithModifiers.qml
+++ b/tests/manual/pointer/tapWithModifiers.qml
@@ -26,8 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
 
 Item {
     width: 200