1 files changed, 11 insertions, 3 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index 54a96a7a0a..0c047d569b 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -6,6 +6,8 @@
 
 #include <qpa/qplatformwindow.h>
 #include <qpa/qplatformwindow_p.h>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 #include <QtGui/QSurfaceFormat>
 #include <QtGui/QImage>
 
@@ -20,9 +22,10 @@ class QXcbScreen;
 class QXcbSyncWindowRequest;
 class QIcon;
 
-class Q_XCB_EXPORT QXcbWindow : public QXcbObject, public QXcbWindowEventListener, public QPlatformWindow
+class Q_XCB_EXPORT QXcbWindow : public QObject, public QXcbObject, public QXcbWindowEventListener, public QPlatformWindow
                               , public QNativeInterface::Private::QXcbWindow
 {
+    Q_OBJECT
 public:
     enum NetWmState {
         NetWmStateAbove = 0x1,
@@ -118,6 +121,8 @@ public:
                           Qt::KeyboardModifiers modifiers, QEvent::Type type, Qt::MouseEventSource source);
 
     void updateNetWmUserTime(xcb_timestamp_t timestamp);
+    void updateWmTransientFor();
+    void registerWmTransientForChild(QXcbWindow *);
 
     WindowTypes wmWindowTypes() const;
     void setWmWindowType(WindowTypes types, Qt::WindowFlags flags);
@@ -217,6 +222,7 @@ protected:
 
     Qt::WindowStates m_windowState = Qt::WindowNoState;
 
+    QMutex m_mappedMutex;
     bool m_mapped = false;
     bool m_transparent = false;
     bool m_deferredActivation = false;
@@ -224,6 +230,7 @@ protected:
     bool m_alertState = false;
     bool m_minimized = false;
     bool m_trayIconWindow = false;
+    bool m_ignorePressedWindowOnMouseLeave = false;
     xcb_window_t m_netWmUserTimeWindow = XCB_NONE;
 
     QSurfaceFormat m_format;
@@ -253,13 +260,14 @@ protected:
     qreal m_sizeHintsScaleFactor = 1.0;
 
     RecreationReasons m_recreationReasons = RecreationNotNeeded;
+
+    QList<QPointer<QXcbWindow>> m_wmTransientForChildren;
 };
 
 class QXcbForeignWindow : public QXcbWindow
 {
 public:
-    QXcbForeignWindow(QWindow *window, WId nativeHandle)
-        : QXcbWindow(window) { m_window = nativeHandle; }
+    QXcbForeignWindow(QWindow *window, WId nativeHandle);
     ~QXcbForeignWindow();
     bool isForeignWindow() const override { return true; }