diff options
Diffstat (limited to 'src/quick/items/qquickevents_p_p.h')
| -rw-r--r-- | src/quick/items/qquickevents_p_p.h | 93 |
1 files changed, 46 insertions, 47 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 24f3cef6c9..f82905333b 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -36,17 +36,18 @@ class QPointerEvent; class QMouseEvent; class QQuickPointerHandler; -class Q_QUICK_PRIVATE_EXPORT QQuickKeyEvent : public QObject +class Q_QUICK_EXPORT QQuickKeyEvent : public QObject { Q_OBJECT - Q_PROPERTY(int key READ key CONSTANT) - Q_PROPERTY(QString text READ text CONSTANT) - Q_PROPERTY(int modifiers READ modifiers CONSTANT) - Q_PROPERTY(bool isAutoRepeat READ isAutoRepeat CONSTANT) - Q_PROPERTY(int count READ count CONSTANT) - Q_PROPERTY(quint32 nativeScanCode READ nativeScanCode CONSTANT) - Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) - QML_ANONYMOUS + Q_PROPERTY(int key READ key CONSTANT FINAL) + Q_PROPERTY(QString text READ text CONSTANT FINAL) + Q_PROPERTY(int modifiers READ modifiers CONSTANT FINAL) + Q_PROPERTY(bool isAutoRepeat READ isAutoRepeat CONSTANT FINAL) + Q_PROPERTY(int count READ count CONSTANT FINAL) + Q_PROPERTY(quint32 nativeScanCode READ nativeScanCode CONSTANT FINAL) + Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted FINAL) + QML_NAMED_ELEMENT(KeyEvent) + QML_UNCREATABLE("Should only be used by signal handlers in the Keys attached property") QML_ADDED_IN_VERSION(2, 0) public: @@ -102,21 +103,23 @@ private: bool m_autoRepeat = false; }; -// used in Qt Location -class Q_QUICK_PRIVATE_EXPORT QQuickMouseEvent : public QObject +class Q_QUICK_EXPORT QQuickMouseEvent : public QObject { Q_OBJECT - Q_PROPERTY(qreal x READ x CONSTANT) - Q_PROPERTY(qreal y READ y CONSTANT) - Q_PROPERTY(int button READ button CONSTANT) - Q_PROPERTY(int buttons READ buttons CONSTANT) - Q_PROPERTY(int modifiers READ modifiers CONSTANT) - Q_PROPERTY(int source READ source CONSTANT REVISION(2, 7)) - Q_PROPERTY(bool wasHeld READ wasHeld CONSTANT) - Q_PROPERTY(bool isClick READ isClick CONSTANT) - Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) - Q_PROPERTY(int flags READ flags CONSTANT REVISION(2, 11)) - QML_ANONYMOUS + Q_PROPERTY(qreal x READ x CONSTANT FINAL) + Q_PROPERTY(qreal y READ y CONSTANT FINAL) + Q_PROPERTY(int button READ button CONSTANT FINAL) + Q_PROPERTY(int buttons READ buttons CONSTANT FINAL) + Q_PROPERTY(int modifiers READ modifiers CONSTANT FINAL) +#if QT_DEPRECATED_SINCE(6, 6) + Q_PROPERTY(int source READ source CONSTANT REVISION(2, 7) FINAL) +#endif + Q_PROPERTY(bool isClick READ isClick CONSTANT FINAL) + Q_PROPERTY(bool wasHeld READ wasHeld CONSTANT FINAL) + Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted FINAL) + Q_PROPERTY(int flags READ flags CONSTANT REVISION(2, 11) FINAL) + QML_NAMED_ELEMENT(MouseEvent) + QML_UNCREATABLE("Should only be used by mouse event signal handlers, for example in MouseArea") QML_ADDED_IN_VERSION(2, 0) public: @@ -145,7 +148,9 @@ public: int button() const { return _button; } int buttons() const { return _buttons; } int modifiers() const { return _modifiers; } +#if QT_DEPRECATED_SINCE(6, 6) int source() const { return _source; } +#endif bool wasHeld() const { return _wasHeld; } bool isClick() const { return _isClick; } @@ -153,7 +158,9 @@ public: void setX(qreal x) { _x = x; } void setY(qreal y) { _y = y; } void setPosition(const QPointF &point) { _x = point.x(); _y = point.y(); } +#if QT_DEPRECATED_SINCE(6, 6) void setSource(Qt::MouseEventSource s) { _source = s; } +#endif bool isAccepted() { return _accepted; } void setAccepted(bool accepted) { _accepted = accepted; } @@ -172,20 +179,21 @@ private: }; #if QT_CONFIG(wheelevent) -class QQuickWheelEvent : public QObject +class Q_QUICK_EXPORT QQuickWheelEvent : public QObject { Q_OBJECT - Q_PROPERTY(const QPointingDevice *device READ pointingDevice CONSTANT) - Q_PROPERTY(qreal x READ x CONSTANT) - Q_PROPERTY(qreal y READ y CONSTANT) - Q_PROPERTY(QPoint angleDelta READ angleDelta CONSTANT) - Q_PROPERTY(QPoint pixelDelta READ pixelDelta CONSTANT) - Q_PROPERTY(Qt::ScrollPhase phase READ phase CONSTANT) - Q_PROPERTY(int buttons READ buttons CONSTANT) - Q_PROPERTY(int modifiers READ modifiers CONSTANT) - Q_PROPERTY(bool inverted READ inverted CONSTANT) - Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) - QML_ANONYMOUS + Q_PROPERTY(const QPointingDevice *device READ pointingDevice CONSTANT FINAL) + Q_PROPERTY(qreal x READ x CONSTANT FINAL) + Q_PROPERTY(qreal y READ y CONSTANT FINAL) + Q_PROPERTY(QPoint angleDelta READ angleDelta CONSTANT FINAL) + Q_PROPERTY(QPoint pixelDelta READ pixelDelta CONSTANT FINAL) + Q_PROPERTY(Qt::ScrollPhase phase READ phase CONSTANT FINAL) + Q_PROPERTY(int buttons READ buttons CONSTANT FINAL) + Q_PROPERTY(int modifiers READ modifiers CONSTANT FINAL) + Q_PROPERTY(bool inverted READ inverted CONSTANT FINAL) + Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted FINAL) + QML_NAMED_ELEMENT(WheelEvent) + QML_UNCREATABLE("Should only be used by wheel event signal handlers, for example in MouseArea") QML_ADDED_IN_VERSION(2, 0) public: @@ -231,11 +239,12 @@ private: }; #endif -class Q_QUICK_PRIVATE_EXPORT QQuickCloseEvent : public QObject +class Q_QUICK_EXPORT QQuickCloseEvent : public QObject { Q_OBJECT - Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) - QML_ANONYMOUS + Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted FINAL) + QML_NAMED_ELEMENT(CloseEvent) + QML_UNCREATABLE("Should only be used by Window's closing signal") QML_ADDED_IN_VERSION(2, 0) public: @@ -250,14 +259,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickKeyEvent) -QML_DECLARE_TYPE(QQuickMouseEvent) -#if QT_CONFIG(wheelevent) -QML_DECLARE_TYPE(QQuickWheelEvent) -#endif -QML_DECLARE_TYPE(QQuickCloseEvent) -QML_DECLARE_TYPE(QPointingDevice) -QML_DECLARE_TYPE(QPointingDeviceUniqueId) -QML_DECLARE_TYPE(QPointerEvent) - #endif // QQUICKEVENTS_P_P_H |