1 files changed, 14 insertions, 12 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index dc33a83ac0..85d22319ae 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -45,7 +45,9 @@
 #include <QtGui/qregion.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qstring.h>
-#include <QtGui/qkeysequence.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/qkeysequence.h>
+#endif
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qmap.h> // ### Qt 6: Remove
@@ -59,7 +61,7 @@
 QT_BEGIN_NAMESPACE
 
 
-class QAction;
+class QGuiAction;
 #ifndef QT_NO_GESTURES
 class QGesture;
 #endif
@@ -350,7 +352,7 @@ public:
     const QPointF &windowPos() const { return mWindowPos; }
     const QPointF &screenPos() const { return mScreenPos; }
 
-    const QTouchDevice *device() const;
+    const QTouchDevice *device() const { return mDevice; }
 
 protected:
     Qt::NativeGestureType mGestureType;
@@ -360,6 +362,7 @@ protected:
     qreal mRealValue;
     ulong mSequenceId;
     quint64 mIntValue;
+    const QTouchDevice *mDevice;
 };
 #endif // QT_NO_GESTURES
 
@@ -374,7 +377,7 @@ public:
     ~QKeyEvent();
 
     int key() const { return k; }
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     bool matches(QKeySequence::StandardKey key) const;
 #endif
     Qt::KeyboardModifiers modifiers() const;
@@ -753,13 +756,13 @@ private:
 #ifndef QT_NO_ACTION
 class Q_GUI_EXPORT QActionEvent : public QEvent
 {
-    QAction *act, *bef;
+    QGuiAction *act, *bef;
 public:
-    QActionEvent(int type, QAction *action, QAction *before = nullptr);
+    QActionEvent(int type, QGuiAction *action, QGuiAction *before = nullptr);
     ~QActionEvent();
 
-    inline QAction *action() const { return act; }
-    inline QAction *before() const { return bef; }
+    inline QGuiAction *action() const { return act; }
+    inline QGuiAction *before() const { return bef; }
 };
 #endif
 
@@ -791,7 +794,7 @@ private:
 };
 #endif
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 class Q_GUI_EXPORT QShortcutEvent : public QEvent
 {
 public:
@@ -826,10 +829,10 @@ private:
 Q_GUI_EXPORT QDebug operator<<(QDebug, const QEvent *);
 #endif
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 inline bool operator==(QKeyEvent *e, QKeySequence::StandardKey key){return (e ? e->matches(key) : false);}
 inline bool operator==(QKeySequence::StandardKey key, QKeyEvent *e){return (e ? e->matches(key) : false);}
-#endif // QT_NO_SHORTCUT
+#endif // QT_CONFIG(shortcut)
 
 class Q_GUI_EXPORT QPointingDeviceUniqueId
 {
@@ -853,7 +856,6 @@ private:
     qint64 m_numericId;
 };
 Q_DECLARE_TYPEINFO(QPointingDeviceUniqueId, Q_MOVABLE_TYPE);
-template <> class QList<QPointingDeviceUniqueId> {}; // to prevent instantiation: use QVector instead
 
 Q_GUI_EXPORT bool operator==(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) noexcept;
 inline bool operator!=(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) noexcept