diff options
| -rw-r--r-- | src/quick/handlers/qquickhandlersmodule.cpp | 1 | ||||
| -rw-r--r-- | src/quick/handlers/qquickpointersinglehandler.cpp | 2 | ||||
| -rw-r--r-- | src/quick/handlers/qquickpointersinglehandler_p.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/handlers/qquickhandlersmodule.cpp b/src/quick/handlers/qquickhandlersmodule.cpp index 4bfdc020d8..4a3a1f6aa2 100644 --- a/src/quick/handlers/qquickhandlersmodule.cpp +++ b/src/quick/handlers/qquickhandlersmodule.cpp @@ -82,6 +82,7 @@ static void qt_quickhandlers_defineModule(const char *uri, int major, int minor) QQuickDragHandler::tr("DragAxis is only available as a grouped property of DragHandler")); qmlRegisterType<QQuickPinchHandler>(uri,major,minor,"PinchHandler"); qmlRegisterType<QQuickTapHandler>(uri,major,minor,"TapHandler"); + qRegisterMetaType<QQuickHandlerPoint>(); } void QQuickHandlersModule::defineModule() diff --git a/src/quick/handlers/qquickpointersinglehandler.cpp b/src/quick/handlers/qquickpointersinglehandler.cpp index 40a99b0e99..0b0f482d8d 100644 --- a/src/quick/handlers/qquickpointersinglehandler.cpp +++ b/src/quick/handlers/qquickpointersinglehandler.cpp @@ -240,6 +240,4 @@ void QQuickHandlerPoint::reset() m_pressedButtons = Qt::NoButton; } -int g_metaTypeId = qRegisterMetaType<QQuickHandlerPoint>(); - QT_END_NAMESPACE diff --git a/src/quick/handlers/qquickpointersinglehandler_p.h b/src/quick/handlers/qquickpointersinglehandler_p.h index 635c9e0a77..8898a1600b 100644 --- a/src/quick/handlers/qquickpointersinglehandler_p.h +++ b/src/quick/handlers/qquickpointersinglehandler_p.h @@ -58,6 +58,7 @@ QT_BEGIN_NAMESPACE class QQuickPointerSingleHandler; class Q_QUICK_PRIVATE_EXPORT QQuickHandlerPoint { + Q_GADGET Q_PROPERTY(int id READ id) Q_PROPERTY(QPointingDeviceUniqueId uniqueId READ uniqueId) Q_PROPERTY(QPointF position READ position) @@ -70,7 +71,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickHandlerPoint { Q_PROPERTY(qreal rotation READ rotation) Q_PROPERTY(qreal pressure READ pressure) Q_PROPERTY(QSizeF ellipseDiameters READ ellipseDiameters) - Q_GADGET public: QQuickHandlerPoint(); |