summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-06-25 18:12:29 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2018-07-17 15:11:51 +0000
commit197c22be541e18b3e8db0d259d4a3e7be3030bb9 (patch)
tree0672adcff8038d81188646d498de5eb9deda6ed1
parentc2004b6a71983ca9f8222875eecd6f7a440f75af (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>
-rw-r--r--examples/quick/imageelements/animatedimage.qml3
-rw-r--r--examples/quick/shapes/content/tapableTriangle.qml5
-rw-r--r--examples/quick/shapes/content/tiger.qml5
-rw-r--r--src/imports/handlers/handlers.pro11
-rw-r--r--src/imports/handlers/plugin.cpp64
-rw-r--r--src/imports/handlers/plugins.qmltypes308
-rw-r--r--src/imports/handlers/qmldir5
-rw-r--r--src/imports/imports.pro1
-rw-r--r--src/quick/doc/snippets/pointerHandlers/dragHandler.qml3
-rw-r--r--src/quick/doc/snippets/pointerHandlers/dragHandlerDifferentTarget.qml3
-rw-r--r--src/quick/doc/snippets/pointerHandlers/dragHandlerNullTarget.qml3
-rw-r--r--src/quick/doc/snippets/pointerHandlers/pinchHandler.qml3
-rw-r--r--src/quick/doc/snippets/pointerHandlers/pinchHandlerDifferentTarget.qml3
-rw-r--r--src/quick/doc/snippets/pointerHandlers/pinchHandlerNullTarget.qml3
-rw-r--r--src/quick/doc/snippets/pointerHandlers/pointHandler.qml3
-rw-r--r--src/quick/handlers/handlers.pri2
-rw-r--r--src/quick/handlers/qquickhandlersmodule.cpp108
-rw-r--r--src/quick/handlers/qquickhandlersmodule_p.h68
-rw-r--r--src/quick/items/qquickitemsmodule.cpp36
-rw-r--r--tests/auto/quick/pointerhandlers/flickableinterop/data/GrooveDragSlider.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/flickableinterop/data/KnobDragSlider.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/flickableinterop/data/TapHandlerButton.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/flickableinterop/data/flickableWithHandlers.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/multipointtoucharea_interop/data/pinchDragMPTA.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/data/DragAnywhereSlider.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/data/Slider.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/data/draggables.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/data/multipleSliders.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/data/reparenting.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/data/simpleTapAndDragHandlers.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttonOverrideHandler.qml3
-rw-r--r--tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttons.qml3
-rw-r--r--tests/manual/mousearea/main.qml3
-rw-r--r--tests/manual/pointer/content/CheckBox.qml4
-rw-r--r--tests/manual/pointer/content/FakeFlickable.qml3
-rw-r--r--tests/manual/pointer/content/FlashAnimation.qml2
-rw-r--r--tests/manual/pointer/content/MomentumAnimation.qml2
-rw-r--r--tests/manual/pointer/content/MouseAreaButton.qml4
-rw-r--r--tests/manual/pointer/content/MouseAreaSlider.qml2
-rw-r--r--tests/manual/pointer/content/MouseFeedbackSprite.qml3
-rw-r--r--tests/manual/pointer/content/MptaButton.qml4
-rw-r--r--tests/manual/pointer/content/MultiButton.qml3
-rw-r--r--tests/manual/pointer/content/ScrollBar.qml3
-rw-r--r--tests/manual/pointer/content/Slider.qml3
-rw-r--r--tests/manual/pointer/content/TapHandlerButton.qml5
-rw-r--r--tests/manual/pointer/content/TextBox.qml3
-rw-r--r--tests/manual/pointer/content/TouchpointFeedbackSprite.qml3
-rw-r--r--tests/manual/pointer/fakeFlickable.qml3
-rw-r--r--tests/manual/pointer/flickableWithHandlers.qml3
-rw-r--r--tests/manual/pointer/flingAnimation.qml3
-rw-r--r--tests/manual/pointer/joystick.qml3
-rw-r--r--tests/manual/pointer/main.qml5
-rw-r--r--tests/manual/pointer/map.qml3
-rw-r--r--tests/manual/pointer/map2.qml3
-rw-r--r--tests/manual/pointer/mixer.qml3
-rw-r--r--tests/manual/pointer/multibuttons.qml3
-rw-r--r--tests/manual/pointer/photosurface.qml3
-rw-r--r--tests/manual/pointer/pinchDragFlingMPTA.qml3
-rw-r--r--tests/manual/pointer/pinchHandler.qml3
-rw-r--r--tests/manual/pointer/pointerDrag.qml3
-rw-r--r--tests/manual/pointer/sidebar.qml1
-rw-r--r--tests/manual/pointer/singlePointHandlerProperties.qml3
-rw-r--r--tests/manual/pointer/tapHandler.qml3
-rw-r--r--tests/manual/pointer/tapWithModifiers.qml3
65 files changed, 99 insertions, 678 deletions
diff --git a/examples/quick/imageelements/animatedimage.qml b/examples/quick/imageelements/animatedimage.qml
index 0a119d0aba..04bc38fe95 100644
--- a/examples/quick/imageelements/animatedimage.qml
+++ b/examples/quick/imageelements/animatedimage.qml
@@ -47,8 +47,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.11
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
import "../shared" as Examples
Column {
diff --git a/examples/quick/shapes/content/tapableTriangle.qml b/examples/quick/shapes/content/tapableTriangle.qml
index be48e23876..22ed577bcb 100644
--- a/examples/quick/shapes/content/tapableTriangle.qml
+++ b/examples/quick/shapes/content/tapableTriangle.qml
@@ -48,9 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.11
-import QtQuick.Shapes 1.11
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
+import QtQuick.Shapes 1.12
Rectangle {
width: 120
diff --git a/examples/quick/shapes/content/tiger.qml b/examples/quick/shapes/content/tiger.qml
index 7fa6ca2706..317ec88b31 100644
--- a/examples/quick/shapes/content/tiger.qml
+++ b/examples/quick/shapes/content/tiger.qml
@@ -48,9 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.11
-import QtQuick.Shapes 1.11
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
+import QtQuick.Shapes 1.12
Shape {
asynchronous: true
diff --git a/src/imports/handlers/handlers.pro b/src/imports/handlers/handlers.pro
deleted file mode 100644
index 0e32644773..0000000000
--- a/src/imports/handlers/handlers.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-CXX_MODULE = qml
-TARGET = handlersplugin
-TARGETPATH = Qt/labs/handlers
-IMPORT_VERSION = 1.0
-
-SOURCES += \
- plugin.cpp
-
-QT += quick-private qml-private
-
-load(qml_plugin)
diff --git a/src/imports/handlers/plugin.cpp b/src/imports/handlers/plugin.cpp
deleted file mode 100644
index a98bbad9c0..0000000000
--- a/src/imports/handlers/plugin.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQml/qqmlextensionplugin.h>
-
-#include <private/qquickhandlersmodule_p.h>
-
-QT_BEGIN_NAMESPACE
-
-//![class decl]
-class QtQuickHandlersPlugin : public QQmlExtensionPlugin
-{
- Q_OBJECT
- Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-public:
- QtQuickHandlersPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { }
- void registerTypes(const char *uri) override
- {
- Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.handlers"));
- Q_UNUSED(uri);
- QQuickHandlersModule::defineModule();
- }
-};
-//![class decl]
-
-QT_END_NAMESPACE
-
-#include "plugin.moc"
diff --git a/src/imports/handlers/plugins.qmltypes b/src/imports/handlers/plugins.qmltypes
deleted file mode 100644
index f51e1e4bf3..0000000000
--- a/src/imports/handlers/plugins.qmltypes
+++ /dev/null
@@ -1,308 +0,0 @@
-import QtQuick.tooling 1.2
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable Qt.labs.handlers 1.0'
-
-Module {
- dependencies: ["QtQuick 2.8"]
- Component {
- name: "QQuickDragAxis"
- prototype: "QObject"
- exports: ["Qt.labs.handlers/DragAxis 1.0"]
- isCreatable: false
- exportMetaObjectRevisions: [0]
- Property { name: "minimum"; type: "double" }
- Property { name: "maximum"; type: "double" }
- Property { name: "enabled"; type: "bool" }
- }
- Component {
- name: "QQuickDragHandler"
- prototype: "QQuickSinglePointHandler"
- exports: ["Qt.labs.handlers/DragHandler 1.0"]
- exportMetaObjectRevisions: [0]
- Property { name: "xAxis"; type: "QQuickDragAxis"; isReadonly: true; isPointer: true }
- Property { name: "yAxis"; type: "QQuickDragAxis"; isReadonly: true; isPointer: true }
- Property { name: "translation"; type: "QVector2D"; isReadonly: true }
- Method { name: "enforceConstraints" }
- }
- Component {
- name: "QQuickEventPoint"
- prototype: "QObject"
- exports: ["Qt.labs.handlers/EventPoint 1.0"]
- isCreatable: false
- exportMetaObjectRevisions: [0]
- Enum {
- name: "States"
- values: {
- "Pressed": 1,
- "Updated": 2,
- "Stationary": 4,
- "Released": 8
- }
- }
- Enum {
- name: "GrabState"
- values: {
- "GrabPassive": 1,
- "UngrabPassive": 2,
- "CancelGrabPassive": 3,
- "OverrideGrabPassive": 4,
- "GrabExclusive": 16,
- "UngrabExclusive": 32,
- "CancelGrabExclusive": 48
- }
- }
- Property { name: "event"; type: "QQuickPointerEvent"; isReadonly: true; isPointer: true }
- Property { name: "position"; type: "QPointF"; isReadonly: true }
- Property { name: "scenePosition"; type: "QPointF"; isReadonly: true }
- Property { name: "scenePressPosition"; type: "QPointF"; isReadonly: true }
- Property { name: "sceneGrabPosition"; type: "QPointF"; isReadonly: true }
- Property { name: "state"; type: "State"; isReadonly: true }
- Property { name: "pointId"; type: "int"; isReadonly: true }
- Property { name: "timeHeld"; type: "double"; isReadonly: true }
- Property { name: "velocity"; type: "QVector2D"; isReadonly: true }
- Property { name: "accepted"; type: "bool" }
- Property { name: "exclusiveGrabber"; type: "QObject"; isPointer: true }
- }
- Component {
- name: "QQuickEventTouchPoint"
- prototype: "QQuickEventPoint"
- exports: ["Qt.labs.handlers/EventTouchPoint 1.0"]
- isCreatable: false
- exportMetaObjectRevisions: [0]
- Property { name: "rotation"; type: "double"; isReadonly: true }
- Property { name: "pressure"; type: "double"; isReadonly: true }
- Property { name: "ellipseDiameters"; type: "QSizeF"; isReadonly: true }
- Property { name: "uniqueId"; type: "QPointingDeviceUniqueId"; isReadonly: true }
- }
- Component {
- name: "QQuickMultiPointHandler"
- prototype: "QQuickPointerDeviceHandler"
- Property { name: "minimumPointCount"; type: "int" }
- Property { name: "maximumPointCount"; type: "int" }
- Property { name: "pointDistanceThreshold"; type: "double" }
- }
- Component {
- name: "QQuickPinchHandler"
- prototype: "QQuickMultiPointHandler"
- exports: ["Qt.labs.handlers/PinchHandler 1.0"]
- exportMetaObjectRevisions: [0]
- Enum {
- name: "PinchOrigin"
- values: {
- "FirstPoint": 0,
- "PinchCenter": 1,
- "TargetCenter": 2
- }
- }
- Property { name: "minimumScale"; type: "double" }
- Property { name: "maximumScale"; type: "double" }
- Property { name: "minimumRotation"; type: "double" }
- Property { name: "maximumRotation"; type: "double" }
- Property { name: "pinchOrigin"; type: "PinchOrigin" }
- Property { name: "centroid"; type: "QPointF"; isReadonly: true }
- Property { name: "centroidVelocity"; type: "QVector2D"; isReadonly: true }
- Property { name: "scale"; type: "double"; isReadonly: true }
- Property { name: "rotation"; type: "double"; isReadonly: true }
- Property { name: "translation"; type: "QVector2D"; isReadonly: true }
- Property { name: "minimumX"; type: "double" }
- Property { name: "maximumX"; type: "double" }
- Property { name: "minimumY"; type: "double" }
- Property { name: "maximumY"; type: "double" }
- Signal { name: "updated" }
- }
- Component {
- name: "QQuickPointHandler"
- prototype: "QQuickSinglePointHandler"
- exports: ["Qt.labs.handlers/PointHandler 1.0"]
- exportMetaObjectRevisions: [0]
- Property { name: "translation"; type: "QVector2D"; isReadonly: true }
- }
- Component {
- name: "QQuickPointerDevice"
- prototype: "QObject"
- exports: ["Qt.labs.handlers/PointerDevice 1.0"]
- isCreatable: false
- exportMetaObjectRevisions: [0]
- Enum {
- name: "DeviceType"
- values: {
- "UnknownDevice": 0,
- "Mouse": 1,
- "TouchScreen": 2,
- "TouchPad": 4,
- "Puck": 8,
- "Stylus": 16,
- "Airbrush": 32,
- "AllDevices": 63
- }
- }
- Enum {
- name: "DeviceTypes"
- values: {
- "UnknownDevice": 0,
- "Mouse": 1,
- "TouchScreen": 2,
- "TouchPad": 4,
- "Puck": 8,
- "Stylus": 16,
- "Airbrush": 32,
- "AllDevices": 63
- }
- }
- Enum {
- name: "PointerType"
- values: {
- "GenericPointer": 1,
- "Finger": 2,
- "Pen": 4,
- "Eraser": 8,
- "Cursor": 16,
- "AllPointerTypes": 31
- }
- }
- Enum {
- name: "PointerTypes"
- values: {
- "GenericPointer": 1,
- "Finger": 2,
- "Pen": 4,
- "Eraser": 8,
- "Cursor": 16,
- "AllPointerTypes": 31
- }
- }
- Enum {
- name: "CapabilityFlag"
- values: {
- "Position": 1,
- "Area": 2,
- "Pressure": 4,
- "Velocity": 8,
- "Scroll": 256,
- "Hover": 512,
- "Rotation": 1024,
- "XTilt": 2048,
- "YTilt": 4096
- }
- }
- Enum {
- name: "Capabilities"
- values: {
- "Position": 1,
- "Area": 2,
- "Pressure": 4,
- "Velocity": 8,
- "Scroll": 256,
- "Hover": 512,
- "Rotation": 1024,
- "XTilt": 2048,
- "YTilt": 4096
- }
- }
- Property { name: "type"; type: "DeviceType"; isReadonly: true }
- Property { name: "pointerType"; type: "PointerType"; isReadonly: true }
- Property { name: "capabilities"; type: "Capabilities"; isReadonly: true }
- Property { name: "maximumTouchPoints"; type: "int"; isReadonly: true }
- Property { name: "buttonCount"; type: "int"; isReadonly: true }
- Property { name: "name"; type: "string"; isReadonly: true }
- Property { name: "uniqueId"; type: "QPointingDeviceUniqueId"; isReadonly: true }
- }
- Component {
- name: "QQuickPointerDeviceHandler"
- prototype: "QQuickPointerHandler"
- Property { name: "acceptedDevices"; type: "QQuickPointerDevice::DeviceTypes" }
- Property { name: "acceptedPointerTypes"; type: "QQuickPointerDevice::PointerTypes" }
- Property { name: "acceptedModifiers"; type: "Qt::KeyboardModifiers" }
- Method {
- name: "setAcceptedDevices"
- Parameter { name: "acceptedDevices"; type: "QQuickPointerDevice::DeviceTypes" }
- }
- Method {
- name: "setAcceptedPointerTypes"
- Parameter { name: "acceptedPointerTypes"; type: "QQuickPointerDevice::PointerTypes" }
- }
- Method {
- name: "setAcceptedModifiers"
- Parameter { name: "acceptedModifiers"; type: "Qt::KeyboardModifiers" }
- }
- }
- Component {
- name: "QQuickPointerEvent"
- prototype: "QObject"
- exports: ["Qt.labs.handlers/PointerEvent 1.0"]
- isCreatable: false
- exportMetaObjectRevisions: [0]
- Property { name: "device"; type: "const QQuickPointerDevice"; isReadonly: true; isPointer: true }
- Property { name: "modifiers"; type: "Qt::KeyboardModifiers"; isReadonly: true }
- Property { name: "button"; type: "Qt::MouseButtons"; isReadonly: true }
- Property { name: "buttons"; type: "Qt::MouseButtons"; isReadonly: true }
- }
- Component {
- name: "QQuickPointerHandler"
- prototype: "QObject"
- exports: ["Qt.labs.handlers/PointerHandler 1.0"]
- isCreatable: false
- exportMetaObjectRevisions: [0]
- Enum {
- name: "GrabPermissions"
- values: {
- "TakeOverForbidden": 0,
- "CanTakeOverFromHandlersOfSameType": 1,
- "CanTakeOverFromHandlersOfDifferentType": 2,
- "CanTakeOverFromItems": 4,
- "CanTakeOverFromAnything": 15,
- "ApprovesTakeOverByHandlersOfSameType": 16,
- "ApprovesTakeOverByHandlersOfDifferentType": 32,
- "ApprovesTakeOverByItems": 64,
- "ApprovesCancellation": 128,
- "ApprovesTakeOverByAnything": 240
- }
- }
- Property { name: "enabled"; type: "bool" }
- Property { name: "active"; type: "bool"; isReadonly: true }
- Property { name: "target"; type: "QQuickItem"; isPointer: true }
- Property { name: "parent"; type: "QQuickItem"; isReadonly: true; isPointer: true }
- Property { name: "grabPermissions"; type: "GrabPermissions" }
- Signal {
- name: "grabChanged"
- Parameter { name: "point"; type: "QQuickEventPoint"; isPointer: true }
- }
- Signal { name: "grabPermissionChanged" }
- Signal {
- name: "canceled"
- Parameter { name: "point"; type: "QQuickEventPoint"; isPointer: true }
- }
- }
- Component {
- name: "QQuickSinglePointHandler"
- prototype: "QQuickPointerDeviceHandler"
- Property { name: "acceptedButtons"; type: "Qt::MouseButtons" }
- Property { name: "point"; type: "QQuickHandlerPoint"; isReadonly: true }
- Signal { name: "singlePointGrabChanged" }
- }
- Component {
- name: "QQuickTapHandler"
- prototype: "QQuickSinglePointHandler"
- exports: ["Qt.labs.handlers/TapHandler 1.0"]
- exportMetaObjectRevisions: [0]
- Enum {
- name: "GesturePolicy"
- values: {
- "DragThreshold": 0,
- "WithinBounds": 1,
- "ReleaseWithinBounds": 2
- }
- }
- Property { name: "pressed"; type: "bool"; isReadonly: true }
- Property { name: "tapCount"; type: "int"; isReadonly: true }
- Property { name: "timeHeld"; type: "double"; isReadonly: true }
- Property { name: "longPressThreshold"; type: "double" }
- Property { name: "gesturePolicy"; type: "GesturePolicy" }
- Signal { name: "tapped" }
- Signal { name: "longPressed" }
- }
-}
diff --git a/src/imports/handlers/qmldir b/src/imports/handlers/qmldir
deleted file mode 100644
index 4896348c2e..0000000000
--- a/src/imports/handlers/qmldir
+++ /dev/null
@@ -1,5 +0,0 @@
-module Qt.labs.handlers
-plugin handlersplugin
-classname QtQuickHandlersPlugin
-typeinfo plugins.qmltypes
-
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 80f493da85..b5f5155502 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -14,7 +14,6 @@ qtHaveModule(quick) {
QT_FOR_CONFIG += quick-private
SUBDIRS += \
- handlers \
layouts \
qtquick2 \
window \
diff --git a/src/quick/doc/snippets/pointerHandlers/dragHandler.qml b/src/quick/doc/snippets/pointerHandlers/dragHandler.qml
index 78a7db5b0c..04ea3967a0 100644
--- a/src/quick/doc/snippets/pointerHandlers/dragHandler.qml
+++ b/src/quick/doc/snippets/pointerHandlers/dragHandler.qml
@@ -48,8 +48,7 @@
**
****************************************************************************/
//![0]
-import QtQuick 2.10
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
Rectangle {
width: 100
diff --git a/src/quick/doc/snippets/pointerHandlers/dragHandlerDifferentTarget.qml b/src/quick/doc/snippets/pointerHandlers/dragHandlerDifferentTarget.qml
index 4c4168de83..a21ea1b39d 100644
--- a/src/quick/doc/snippets/pointerHandlers/dragHandlerDifferentTarget.qml
+++ b/src/quick/doc/snippets/pointerHandlers/dragHandlerDifferentTarget.qml
@@ -48,8 +48,7 @@
**
****************************************************************************/
//![0]
-import QtQuick 2.10
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
Item {
width: 640
diff --git a/src/quick/doc/snippets/pointerHandlers/dragHandlerNullTarget.qml b/src/quick/doc/snippets/pointerHandlers/dragHandlerNullTarget.qml
index 09429ec1d2..d418e04731 100644
--- a/src/quick/doc/snippets/pointerHandlers/dragHandlerNullTarget.qml
+++ b/src/quick/doc/snippets/pointerHandlers/dragHandlerNullTarget.qml
@@ -48,8 +48,7 @@
**
****************************************************************************/
//![0]
-import QtQuick 2.10
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
Item {
width: 640
diff --git a/src/quick/doc/snippets/pointerHandlers/pinchHandler.qml b/src/quick/doc/snippets/pointerHandlers/pinchHandler.qml
index 955047d115..dd0542a953 100644
--- a/src/quick/doc/snippets/pointerHandlers/pinchHandler.qml
+++ b/src/quick/doc/snippets/pointerHandlers/pinchHandler.qml
@@ -48,8 +48,7 @@
**
****************************************************************************/
//![0]
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
Rectangle {
width: 400
diff --git a/src/quick/doc/snippets/pointerHandlers/pinchHandlerDifferentTarget.qml b/src/quick/doc/snippets/pointerHandlers/pinchHandlerDifferentTarget.qml
index a5255a64e3..b071e294af 100644
--- a/src/quick/doc/snippets/pointerHandlers/pinchHandlerDifferentTarget.qml
+++ b/src/quick/doc/snippets/pointerHandlers/pinchHandlerDifferentTarget.qml
@@ -48,8 +48,7 @@
**
****************************************************************************/
//![0]
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
Item {
width: 640
diff --git a/src/quick/doc/snippets/pointerHandlers/pinchHandlerNullTarget.qml b/src/quick/doc/snippets/pointerHandlers/pinchHandlerNullTarget.qml
index 7d21efcb84..ade59d29f0 100644
--- a/src/quick/doc/snippets/pointerHandlers/pinchHandlerNullTarget.qml
+++ b/src/quick/doc/snippets/pointerHandlers/pinchHandlerNullTarget.qml
@@ -48,8 +48,7 @@
**
****************************************************************************/
//![0]
-import QtQuick 2.8
-import Qt.labs.handlers 1.0
+import QtQuick 2.12
Item {
width: 640
diff --git a/src/quick/doc/snippets/pointerHandlers/pointHandler.qml b/src/quick/doc/snippets/pointerHandlers/pointHandler.qml
index 262eb607b6..20be120120 100644
--- a/src/quick/doc/snippets/pointerHandlers/pointHandler.qml
+++ b/src/quick/doc/snippets/pointerHandlers/pointHandler.qml
@@ -48,9 +48,8 @@
**
****************************************************************************/
//![0]
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Window 2.2
-import Qt.labs.handlers 1.0
Window {
width: 480
diff --git a/src/quick/handlers/handlers.pri b/src/quick/handlers/handlers.pri
index 111a526ce2..1258822f40 100644
--- a/src/quick/handlers/handlers.pri
+++ b/src/quick/handlers/handlers.pri
@@ -1,7 +1,6 @@
HEADERS += \
$$PWD/qquickdraghandler_p.h \
$$PWD/qquickhandlerpoint_p.h \
- $$PWD/qquickhandlersmodule_p.h \
$$PWD/qquickhoverhandler_p.h \
$$PWD/qquickmultipointhandler_p.h \
$$PWD/qquickpinchhandler_p.h \
@@ -17,7 +16,6 @@ HEADERS += \
SOURCES += \
$$PWD/qquickdraghandler.cpp \
$$PWD/qquickhandlerpoint.cpp \
- $$PWD/qquickhandlersmodule.cpp \
$$PWD/qquickhoverhandler.cpp \
$$PWD/qquickmultipointhandler.cpp \
$$PWD/qquickpinchhandler.cpp \
diff --git a/src/quick/handlers/qquickhandlersmodule.cpp b/src/quick/handlers/qquickhandlersmodule.cpp
deleted file mode 100644
index 814602c0bd..0000000000
--- a/src/quick/handlers/qquickhandlersmodule.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qquickhandlersmodule_p.h"
-#include "qquickpointerhandler_p.h"
-#include "qquickdraghandler_p.h"
-#include "qquickhoverhandler_p.h"
-#include "qquickpinchhandler_p.h"
-#include "qquickpointhandler_p.h"
-#include "qquicktaphandler_p.h"
-
-static void initResources()
-{
-#ifdef QT_STATIC
- Q_INIT_RESOURCE(qmake_Qt_labs_handlers);
-#endif
-}
-
-QT_BEGIN_NAMESPACE
-
-static QQmlPrivate::AutoParentResult handler_autoParent(QObject *obj, QObject *parent)
-{
- if (qmlobject_cast<QQuickItem *>(parent)) {
- QQuickPointerHandler *handler = qmlobject_cast<QQuickPointerHandler *>(obj);
- if (handler) {
- handler->setParent(parent);
- return QQmlPrivate::Parented;
- }
- }
- return QQmlPrivate::IncompatibleObject;
-}
-
-static void qt_quickhandlers_defineModule(const char *uri, int major, int minor)
-{
- QQmlPrivate::RegisterAutoParent autoparent = { 0, &handler_autoParent };
- QQmlPrivate::qmlregister(QQmlPrivate::AutoParentRegistration, &autoparent);
- qmlRegisterUncreatableType<QQuickPointerEvent>(uri, major, minor, "PointerEvent",
- QQuickPointerHandler::tr("PointerEvent is only available as a parameter of several signals in PointerHandler"));
- qmlRegisterUncreatableType<QQuickEventPoint>(uri, major, minor, "EventPoint",
- QQuickPointerHandler::tr("EventPoint is only available as a member of PointerEvent"));
- qmlRegisterUncreatableType<QQuickEventTouchPoint>(uri, major, minor, "EventTouchPoint",
- QQuickPointerHandler::tr("EventTouchPoint is only available as a member of PointerEvent"));
- qmlRegisterUncreatableType<QQuickPointerDevice>(uri, major, minor, "PointerDevice",
- QQuickPointerHandler::tr("PointerDevice is only available as a property of PointerEvent"));
- qRegisterMetaType<QPointingDeviceUniqueId>("QPointingDeviceUniqueId");
- qmlRegisterUncreatableType<QPointingDeviceUniqueId>(uri, major, minor, "PointingDeviceUniqueId",
- QQuickPointerHandler::tr("PointingDeviceUniqueId is only available as a property of PointerEvent"));
-
- qmlRegisterUncreatableType<QQuickPointerHandler>(uri,major,minor,"PointerHandler",
- QQuickPointerHandler::tr("PointerHandler is an abstract base class"));
- qmlRegisterType<QQuickPointHandler>(uri,major,minor,"PointHandler");
- qmlRegisterType<QQuickDragHandler>(uri,major,minor,"DragHandler");
- qmlRegisterUncreatableType<QQuickDragAxis>(uri, major, minor, "DragAxis",
- QQuickDragHandler::tr("DragAxis is only available as a grouped property of DragHandler"));
- qmlRegisterType<QQuickHoverHandler>(uri,major,minor,"HoverHandler");
- qmlRegisterType<QQuickPinchHandler>(uri,major,minor,"PinchHandler");
- qmlRegisterType<QQuickTapHandler>(uri,major,minor,"TapHandler");
- qRegisterMetaType<QQuickHandlerPoint>();
-}
-
-void QQuickHandlersModule::defineModule()
-{
- initResources();
-
- const char uri[] = "Qt.labs.handlers";
- int majorVersion = 1;
- int minorVersion = 0;
-
- qt_quickhandlers_defineModule(uri, majorVersion, minorVersion);
-}
-
-QT_END_NAMESPACE
diff --git a/src/quick/handlers/qquickhandlersmodule_p.h b/src/quick/handlers/qquickhandlersmodule_p.h
deleted file mode 100644
index 7eb8d39b98..0000000000
--- a/src/quick/handlers/qquickhandlersmodule_p.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQUICKHANDLERSMODULE_P_H
-#define QQUICKHANDLERSMODULE_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qqml.h>
-#include <private/qtquickglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QUICK_PRIVATE_EXPORT QQuickHandlersModule
-{
-public:
- static void defineModule();
-};
-
-QT_END_NAMESPACE
-
-#endif // QQUICKHANDLERSMODULE_P_H
-
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index 806fd9e465..3a42766667 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -113,6 +113,12 @@
#include <private/qqmlmetatype_p.h>
#include <QtQuick/private/qquickaccessibleattached_p.h>
+#include "handlers/qquickdraghandler_p.h"
+#include "handlers/qquickhoverhandler_p.h"
+#include "handlers/qquickpinchhandler_p.h"
+#include "handlers/qquickpointhandler_p.h"
+#include "handlers/qquicktaphandler_p.h"
+
QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcTransient)
QT_END_NAMESPACE
@@ -135,6 +141,9 @@ static QQmlPrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject
win->setTransientParent(parentItem->window());
return QQmlPrivate::Parented;
}
+ } else if (QQuickPointerHandler *handler = qmlobject_cast<QQuickPointerHandler *>(obj)) {
+ handler->setParent(parent);
+ return QQmlPrivate::Parented;
}
return QQmlPrivate::IncompatibleObject;
} else if (QQuickWindow *parentWindow = qmlobject_cast<QQuickWindow *>(parent)) {
@@ -423,6 +432,33 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
#endif
qmlRegisterType<QQuickItem, 11>(uri, 2, 11,"Item");
+ // classes related to Input Handlers which are newly exposed since 5.12
+ qmlRegisterUncreatableType<QQuickPointerEvent>(uri, 2, 12, "PointerEvent",
+ QQuickPointerHandler::tr("PointerEvent is only available as a parameter of several signals in PointerHandler"));
+ qmlRegisterUncreatableType<QQuickPointerMouseEvent>(uri, 2, 12, "PointerMouseEvent",
+ QQuickPointerHandler::tr("PointerMouseEvent is only available as a parameter of several signals in PointerHandler"));
+ qmlRegisterUncreatableType<QQuickPointerTouchEvent>(uri, 2, 12, "PointerTouchEvent",
+ QQuickPointerHandler::tr("PointerTouchEvent is only available as a parameter of several signals in PointerHandler"));
+ qmlRegisterUncreatableType<QQuickEventPoint>(uri, 2, 12, "EventPoint",
+ QQuickPointerHandler::tr("EventPoint is only available as a member of PointerEvent"));
+ qmlRegisterUncreatableType<QQuickEventTouchPoint>(uri, 2, 12, "EventTouchPoint",
+ QQuickPointerHandler::tr("EventTouchPoint is only available as a member of PointerEvent"));
+ qmlRegisterUncreatableType<QQuickPointerDevice>(uri, 2, 12, "PointerDevice",
+ QQuickPointerHandler::tr("PointerDevice is only available as a property of PointerEvent"));
+
+ // Input Handlers are part of QtQuick, not a separate module, since 5.12
+ qmlRegisterUncreatableType<QQuickPointerHandler>(uri, 2, 12, "PointerHandler",
+ QQuickPointerHandler::tr("PointerHandler is an abstract base class"));
+ qmlRegisterType<QQuickPointHandler>(uri, 2, 12, "PointHandler");
+ qmlRegisterType<QQuickDragHandler>(uri, 2, 12, "DragHandler");
+ qmlRegisterUncreatableType<QQuickDragAxis>(uri, 2, 12, "DragAxis",
+ QQuickDragHandler::tr("DragAxis is only available as a grouped property of DragHandler"));
+ qmlRegisterType<QQuickHoverHandler>(uri, 2, 12, "HoverHandler");
+ qmlRegisterType<QQuickPinchHandler>(uri, 2, 12, "PinchHandler");
+ qmlRegisterType<QQuickTapHandler>(uri, 2, 12, "TapHandler");
+ qRegisterMetaType<QQuickHandlerPoint>();
+
+ // The rest of the 5.12 revisions
qmlRegisterType<QQuickAnimatedSprite, 12>("QtQuick", 2, 12, "AnimatedSprite");
qmlRegisterType<QQuickGradient, 12>(uri, 2, 12, "Gradient");
qmlRegisterType<QQuickFlickable, 12>(uri, 2, 12, "Flickable");
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
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