1 files changed, 11 insertions, 17 deletions

diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h
index 8e503bbf3d..87f40e2b04 100644
--- a/src/gui/kernel/qwindowsysteminterface_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_p.h
@@ -176,11 +176,12 @@ public:
 
     class ApplicationStateChangedEvent : public WindowSystemEvent {
     public:
-        ApplicationStateChangedEvent(Qt::ApplicationState newState)
-            : WindowSystemEvent(ApplicationStateChanged), newState(newState)
+        ApplicationStateChangedEvent(Qt::ApplicationState newState, bool forcePropagate = false)
+            : WindowSystemEvent(ApplicationStateChanged), newState(newState), forcePropagate(forcePropagate)
         { }
 
         Qt::ApplicationState newState;
+        bool forcePropagate;
     };
 
     class FlushEventsEvent : public WindowSystemEvent {
@@ -278,17 +279,10 @@ public:
 
     class ScreenGeometryEvent : public WindowSystemEvent {
     public:
-        ScreenGeometryEvent(QScreen *s, const QRect &g)
-            : WindowSystemEvent(ScreenGeometry), screen(s), geometry(g) { }
+        ScreenGeometryEvent(QScreen *s, const QRect &g, const QRect &ag)
+            : WindowSystemEvent(ScreenGeometry), screen(s), geometry(g), availableGeometry(ag) { }
         QPointer<QScreen> screen;
         QRect geometry;
-    };
-
-    class ScreenAvailableGeometryEvent : public WindowSystemEvent {
-    public:
-        ScreenAvailableGeometryEvent(QScreen *s, const QRect &g)
-            : WindowSystemEvent(ScreenAvailableGeometry), screen(s), availableGeometry(g) { }
-        QPointer<QScreen> screen;
         QRect availableGeometry;
     };
 
@@ -337,19 +331,19 @@ public:
 
     class TabletEvent : public InputEvent {
     public:
-        static void handleTabletEvent(QWindow *w, bool down, const QPointF &local, const QPointF &global,
-                                      int device, int pointerType, qreal pressure, int xTilt, int yTilt,
+        static void handleTabletEvent(QWindow *w, const QPointF &local, const QPointF &global,
+                                      int device, int pointerType, Qt::MouseButtons buttons, qreal pressure, int xTilt, int yTilt,
                                       qreal tangentialPressure, qreal rotation, int z, qint64 uid,
                                       Qt::KeyboardModifiers modifiers = Qt::NoModifier);
 
-        TabletEvent(QWindow *w, ulong time, bool down, const QPointF &local, const QPointF &global,
-                    int device, int pointerType, qreal pressure, int xTilt, int yTilt, qreal tpressure,
+        TabletEvent(QWindow *w, ulong time, const QPointF &local, const QPointF &global,
+                    int device, int pointerType, Qt::MouseButtons b, qreal pressure, int xTilt, int yTilt, qreal tpressure,
                     qreal rotation, int z, qint64 uid, Qt::KeyboardModifiers mods)
             : InputEvent(w, time, Tablet, mods),
-              down(down), local(local), global(global), device(device), pointerType(pointerType),
+              buttons(b), local(local), global(global), device(device), pointerType(pointerType),
               pressure(pressure), xTilt(xTilt), yTilt(yTilt), tangentialPressure(tpressure),
               rotation(rotation), z(z), uid(uid) { }
-        bool down;
+        Qt::MouseButtons buttons;
         QPointF local;
         QPointF global;
         int device;