diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-03-14 17:37:36 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-04 12:02:33 +0000 |
| commit | 4038160a32dcb51d843fb751a9a9340e7cc2bb63 (patch) | |
| tree | 544532ebf707154f32baa01fe590d263845d205d /src/quick/items/qquickitemsmodule.cpp | |
| parent | 63a03f6772b8c008c3b7e6d17e484f585244a5e7 (diff) | |
MultiPointTouchArea.TouchPoint: add rotation, uniqueId and ellipseDiameters
So far uniqueId and rotation are mainly applicable to TUIO.
Deprecate the area property in favor of ellipseDiameters.
Also improve the mpta-crosshairs manual test to show this information.
Change-Id: I16ea6618ae21ce66dac45638d6e2bb3c0a3b1818
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/items/qquickitemsmodule.cpp')
| -rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index ee7b566266..0b325d7fa8 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -377,6 +377,9 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QQuickFlickable, 9>(uri, 2, 9, "Flickable"); qmlRegisterType<QQuickMouseArea, 9>(uri, 2, 9, "MouseArea"); qmlRegisterType<QQuickTextInput, 9>(uri, 2, 9, "TextInput"); + qmlRegisterType<QQuickTouchPoint>(uri, 2, 9, "TouchPoint"); + qRegisterMetaType<QPointingDeviceUniqueId>("QPointingDeviceUniqueId"); + qmlRegisterUncreatableType<QPointingDeviceUniqueId>(uri, 2, 9, "PointingDeviceUniqueId", QQuickTouchPoint::tr("PointingDeviceUniqueId is only available via read-only properties")); } static void initResources() |