diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:34 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:34 +0200 |
| commit | 51a158929b55dffbdfb757da8bd6a2cd181906c6 (patch) | |
| tree | d887ef986f357614624d65277f94d740c410be21 /src/quick/items/qquickitemsmodule.cpp | |
| parent | 3a06d02197179240b8ea589534dc3416c75fc0f2 (diff) | |
| parent | 3f8bcced6790059c279430ff34903c16bea25a98 (diff) | |
Merge 5.14 into 5.14.1v5.14.1
Change-Id: Iefb900b42cc0476e62342724a5f3a480c09ce354
Diffstat (limited to 'src/quick/items/qquickitemsmodule.cpp')
| -rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 7bc6eefe0a..86253e770f 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtQuick module of the Qt Toolkit. @@ -494,6 +494,8 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) #endif #if QT_CONFIG(wheelevent) qmlRegisterType<QQuickWheelHandler>(uri, 2, 14, "WheelHandler"); + qmlRegisterUncreatableType<QQuickPointerScrollEvent>(uri, 2, 14, "PointerScrollEvent", + QQuickPointerHandler::tr("PointerScrollEvent is only available via the WheelHandler::wheel signal")); #endif qmlRegisterUncreatableType<QQuickImageBase, 14>(uri, 2, 14, "ImageBase", QQuickPointerHandler::tr("ImageBase is an abstract base class")); |