diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-06-25 18:12:29 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-17 15:11:51 +0000 |
commit | 197c22be541e18b3e8db0d259d4a3e7be3030bb9 (patch) | |
tree | 0672adcff8038d81188646d498de5eb9deda6ed1 /tests/auto/quick/pointerhandlers | |
parent | c2004b6a71983ca9f8222875eecd6f7a440f75af (diff) |
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>
Diffstat (limited to 'tests/auto/quick/pointerhandlers')
14 files changed, 14 insertions, 28 deletions
diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/data/GrooveDragSlider.qml b/tests/auto/quick/pointerhandlers/flickableinterop/data/GrooveDragSlider.qml index 485c6ce914..7a32170bed 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/data/GrooveDragSlider.qml +++ b/tests/auto/quick/pointerhandlers/flickableinterop/data/GrooveDragSlider.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/auto/quick/pointerhandlers/flickableinterop/data/KnobDragSlider.qml b/tests/auto/quick/pointerhandlers/flickableinterop/data/KnobDragSlider.qml index 7f6535651c..b3d621c447 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/data/KnobDragSlider.qml +++ b/tests/auto/quick/pointerhandlers/flickableinterop/data/KnobDragSlider.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/auto/quick/pointerhandlers/flickableinterop/data/TapHandlerButton.qml b/tests/auto/quick/pointerhandlers/flickableinterop/data/TapHandlerButton.qml index 55f77460f1..2c9fa30a70 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/data/TapHandlerButton.qml +++ b/tests/auto/quick/pointerhandlers/flickableinterop/data/TapHandlerButton.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/auto/quick/pointerhandlers/flickableinterop/data/flickableWithHandlers.qml b/tests/auto/quick/pointerhandlers/flickableinterop/data/flickableWithHandlers.qml index 8adec58621..5693a6acd2 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/data/flickableWithHandlers.qml +++ b/tests/auto/quick/pointerhandlers/flickableinterop/data/flickableWithHandlers.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/auto/quick/pointerhandlers/multipointtoucharea_interop/data/pinchDragMPTA.qml b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/data/pinchDragMPTA.qml index 084cc25414..f841b45431 100644 --- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/data/pinchDragMPTA.qml +++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/data/pinchDragMPTA.qml @@ -26,8 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import Qt.labs.handlers 1.0 +import QtQuick 2.12 Rectangle { width: 1024; height: 600 diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/DragAnywhereSlider.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/DragAnywhereSlider.qml index fe5f74743d..778a799d70 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/DragAnywhereSlider.qml +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/DragAnywhereSlider.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/auto/quick/pointerhandlers/qquickdraghandler/data/Slider.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/Slider.qml index a41a8285b6..782750b783 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/Slider.qml +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/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/auto/quick/pointerhandlers/qquickdraghandler/data/draggables.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/draggables.qml index 5b701b4033..e468280ea6 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/draggables.qml +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/draggables.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/auto/quick/pointerhandlers/qquickdraghandler/data/multipleSliders.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/multipleSliders.qml index ba6e2d00a8..f6042f4461 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/multipleSliders.qml +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/multipleSliders.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/auto/quick/pointerhandlers/qquickdraghandler/data/reparenting.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/reparenting.qml index 3545badd86..e23cddf7a6 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/reparenting.qml +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/reparenting.qml @@ -1,5 +1,4 @@ -import QtQuick 2.8 -import Qt.labs.handlers 1.0 +import QtQuick 2.12 Grid { id: root diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/simpleTapAndDragHandlers.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/simpleTapAndDragHandlers.qml index adb8332213..6e5574787c 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/simpleTapAndDragHandlers.qml +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/simpleTapAndDragHandlers.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/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml index 0b7713bd13..ba22e434ce 100644 --- a/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml +++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.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/auto/quick/pointerhandlers/qquicktaphandler/data/buttonOverrideHandler.qml b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttonOverrideHandler.qml index 219d4a70a8..4a8b8e1375 100644 --- a/tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttonOverrideHandler.qml +++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttonOverrideHandler.qml @@ -26,8 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import Qt.labs.handlers 1.0 +import QtQuick 2.12 Item { width: 320 diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttons.qml b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttons.qml index 1df9bb9b96..821b8073e9 100644 --- a/tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttons.qml +++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttons.qml @@ -26,8 +26,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import Qt.labs.handlers 1.0 +import QtQuick 2.12 Item { width: 320 |