diff options
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmeventtranslator.h')
-rw-r--r-- | src/plugins/platforms/wasm/qwasmeventtranslator.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.h b/src/plugins/platforms/wasm/qwasmeventtranslator.h index 0be5612ef1..c91fee02f3 100644 --- a/src/plugins/platforms/wasm/qwasmeventtranslator.h +++ b/src/plugins/platforms/wasm/qwasmeventtranslator.h @@ -35,9 +35,14 @@ #include <QtCore/qpoint.h> #include <emscripten/html5.h> #include "qwasmwindow.h" +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include <QtGui/qinputdevice.h> +#else #include <QtGui/qtouchdevice.h> +#endif #include <QHash> #include <QCursor> +#include <QPointer> QT_BEGIN_NAMESPACE @@ -82,16 +87,20 @@ private: QMap <int, QPointF> pressedTouchIds; private: - QWindow *draggedWindow; - QWindow *pressedWindow; - QWindow *lastWindow; + QPointer<QWindow> draggedWindow; + QPointer<QWindow> pressedWindow; + QPointer<QWindow> lastWindow; Qt::MouseButtons pressedButtons; QWasmWindow::ResizeMode resizeMode; QPoint resizePoint; QRect resizeStartRect; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QPointingDevice *touchDevice; +#else QTouchDevice *touchDevice; - quint64 getTimestamp(); +#endif + static quint64 getTimestamp(); Qt::Key m_emDeadKey = Qt::Key_unknown; bool m_emStickyDeadKey = false; |