diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-08-04 13:12:57 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-08-04 13:15:54 +0200 |
| commit | 175f53860af034edf5a2dd5e9a5555376e604180 (patch) | |
| tree | c3ce4eb15fc9918d7bf4b45f9ddc2d7fb8f65e60 /src/quick/items/qquickevents_p_p.h | |
| parent | e2329c91e2999b4533a38c2b9f204af88e0e31ec (diff) | |
| parent | ecf365c0b2ceeda97e42e4bc408964a9588cb6f2 (diff) | |
Merge branch 'dev' into wip/pointerhandler
Conflicts:
src/quick/items/qquickwindow.cpp: we need the fix for QTBUG-31861 but
now using QQuickPointerMouseEvent
src/quick/items/qquickwindow_p.h: hover events need timestamps (e4f7ab42)
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp: added test for QTBUG-31861
Change-Id: Ic120513b69b318df3ba62d8174c276cbf6b7b55e
Diffstat (limited to 'src/quick/items/qquickevents_p_p.h')
| -rw-r--r-- | src/quick/items/qquickevents_p_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 47fda2fe01..f3e6fdddff 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -284,6 +284,8 @@ private: bool m_valid : 1; bool m_accept : 1; int m_reserved : 30; + + Q_DISABLE_COPY(QQuickEventPoint) }; class Q_QUICK_PRIVATE_EXPORT QQuickEventTouchPoint : public QQuickEventPoint @@ -306,6 +308,8 @@ private: qreal m_rotation; qreal m_pressure; QPointerUniqueId m_uniqueId; + + Q_DISABLE_COPY(QQuickEventTouchPoint) }; class Q_QUICK_PRIVATE_EXPORT QQuickPointerEvent : public QObject @@ -390,6 +394,8 @@ public: private: QQuickEventPoint *m_mousePoint; + + Q_DISABLE_COPY(QQuickPointerMouseEvent) }; class Q_QUICK_PRIVATE_EXPORT QQuickPointerTouchEvent : public QQuickPointerEvent @@ -418,6 +424,8 @@ public: private: int m_pointCount; QVector<QQuickEventTouchPoint *> m_touchPoints; + + Q_DISABLE_COPY(QQuickPointerTouchEvent) }; // ### Qt 6: move this to qtbase, replace QTouchDevice and the enums in QTabletEvent |