From 197c22be541e18b3e8db0d259d4a3e7be3030bb9 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 25 Jun 2018 18:12:29 +0200 Subject: Get rid of Qt.labs.handlers import, merge into QtQuick 2.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... and clean up imports in examples, snippets and tests accordingly. Change-Id: I5bbe63afd2614cdc2c1ec7d179c9acd6bc03b167 Reviewed-by: Jan Arve Sæther --- src/imports/handlers/handlers.pro | 11 - src/imports/handlers/plugin.cpp | 64 ----- src/imports/handlers/plugins.qmltypes | 308 --------------------- src/imports/handlers/qmldir | 5 - src/imports/imports.pro | 1 - .../doc/snippets/pointerHandlers/dragHandler.qml | 3 +- .../pointerHandlers/dragHandlerDifferentTarget.qml | 3 +- .../pointerHandlers/dragHandlerNullTarget.qml | 3 +- .../doc/snippets/pointerHandlers/pinchHandler.qml | 3 +- .../pinchHandlerDifferentTarget.qml | 3 +- .../pointerHandlers/pinchHandlerNullTarget.qml | 3 +- .../doc/snippets/pointerHandlers/pointHandler.qml | 3 +- src/quick/handlers/handlers.pri | 2 - src/quick/handlers/qquickhandlersmodule.cpp | 108 -------- src/quick/handlers/qquickhandlersmodule_p.h | 68 ----- src/quick/items/qquickitemsmodule.cpp | 36 +++ 16 files changed, 43 insertions(+), 581 deletions(-) delete mode 100644 src/imports/handlers/handlers.pro delete mode 100644 src/imports/handlers/plugin.cpp delete mode 100644 src/imports/handlers/plugins.qmltypes delete mode 100644 src/imports/handlers/qmldir delete mode 100644 src/quick/handlers/qquickhandlersmodule.cpp delete mode 100644 src/quick/handlers/qquickhandlersmodule_p.h (limited to 'src') 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 - -#include - -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(parent)) { - QQuickPointerHandler *handler = qmlobject_cast(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(uri, major, minor, "PointerEvent", - QQuickPointerHandler::tr("PointerEvent is only available as a parameter of several signals in PointerHandler")); - qmlRegisterUncreatableType(uri, major, minor, "EventPoint", - QQuickPointerHandler::tr("EventPoint is only available as a member of PointerEvent")); - qmlRegisterUncreatableType(uri, major, minor, "EventTouchPoint", - QQuickPointerHandler::tr("EventTouchPoint is only available as a member of PointerEvent")); - qmlRegisterUncreatableType(uri, major, minor, "PointerDevice", - QQuickPointerHandler::tr("PointerDevice is only available as a property of PointerEvent")); - qRegisterMetaType("QPointingDeviceUniqueId"); - qmlRegisterUncreatableType(uri, major, minor, "PointingDeviceUniqueId", - QQuickPointerHandler::tr("PointingDeviceUniqueId is only available as a property of PointerEvent")); - - qmlRegisterUncreatableType(uri,major,minor,"PointerHandler", - QQuickPointerHandler::tr("PointerHandler is an abstract base class")); - qmlRegisterType(uri,major,minor,"PointHandler"); - qmlRegisterType(uri,major,minor,"DragHandler"); - qmlRegisterUncreatableType(uri, major, minor, "DragAxis", - QQuickDragHandler::tr("DragAxis is only available as a grouped property of DragHandler")); - qmlRegisterType(uri,major,minor,"HoverHandler"); - qmlRegisterType(uri,major,minor,"PinchHandler"); - qmlRegisterType(uri,major,minor,"TapHandler"); - qRegisterMetaType(); -} - -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 -#include - -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 #include +#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(obj)) { + handler->setParent(parent); + return QQmlPrivate::Parented; } return QQmlPrivate::IncompatibleObject; } else if (QQuickWindow *parentWindow = qmlobject_cast(parent)) { @@ -423,6 +432,33 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) #endif qmlRegisterType(uri, 2, 11,"Item"); + // classes related to Input Handlers which are newly exposed since 5.12 + qmlRegisterUncreatableType(uri, 2, 12, "PointerEvent", + QQuickPointerHandler::tr("PointerEvent is only available as a parameter of several signals in PointerHandler")); + qmlRegisterUncreatableType(uri, 2, 12, "PointerMouseEvent", + QQuickPointerHandler::tr("PointerMouseEvent is only available as a parameter of several signals in PointerHandler")); + qmlRegisterUncreatableType(uri, 2, 12, "PointerTouchEvent", + QQuickPointerHandler::tr("PointerTouchEvent is only available as a parameter of several signals in PointerHandler")); + qmlRegisterUncreatableType(uri, 2, 12, "EventPoint", + QQuickPointerHandler::tr("EventPoint is only available as a member of PointerEvent")); + qmlRegisterUncreatableType(uri, 2, 12, "EventTouchPoint", + QQuickPointerHandler::tr("EventTouchPoint is only available as a member of PointerEvent")); + qmlRegisterUncreatableType(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(uri, 2, 12, "PointerHandler", + QQuickPointerHandler::tr("PointerHandler is an abstract base class")); + qmlRegisterType(uri, 2, 12, "PointHandler"); + qmlRegisterType(uri, 2, 12, "DragHandler"); + qmlRegisterUncreatableType(uri, 2, 12, "DragAxis", + QQuickDragHandler::tr("DragAxis is only available as a grouped property of DragHandler")); + qmlRegisterType(uri, 2, 12, "HoverHandler"); + qmlRegisterType(uri, 2, 12, "PinchHandler"); + qmlRegisterType(uri, 2, 12, "TapHandler"); + qRegisterMetaType(); + + // The rest of the 5.12 revisions qmlRegisterType("QtQuick", 2, 12, "AnimatedSprite"); qmlRegisterType(uri, 2, 12, "Gradient"); qmlRegisterType(uri, 2, 12, "Flickable"); -- cgit v1.2.3