1 files changed, 8 insertions, 15 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index c4f49c593c..99e8e40725 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -105,7 +105,7 @@ public:
 
     QSurfaceFormat format() const override;
 
-    void windowEvent(QEvent *event) override;
+    bool windowEvent(QEvent *event) override;
 
     bool startSystemResize(const QPoint &pos, Qt::Corner corner) override;
     bool startSystemMove(const QPoint &pos) override;
@@ -121,7 +121,7 @@ public:
     QImage::Format imageFormat() const { return m_imageFormat; }
     bool imageNeedsRgbSwap() const { return m_imageRgbSwap; }
 
-    bool handleGenericEvent(xcb_generic_event_t *event, long *result)  override;
+    bool handleNativeEvent(xcb_generic_event_t *event)  override;
 
     void handleExposeEvent(const xcb_expose_event_t *event) override;
     void handleClientMessageEvent(const xcb_client_message_event_t *event) override;
@@ -137,7 +137,7 @@ public:
     void handleFocusInEvent(const xcb_focus_in_event_t *event) override;
     void handleFocusOutEvent(const xcb_focus_out_event_t *event) override;
     void handlePropertyNotifyEvent(const xcb_property_notify_event_t *event) override;
-#if QT_CONFIG(xinput2)
+#if QT_CONFIG(xcb_xinput)
     void handleXIMouseEvent(xcb_ge_event_t *, Qt::MouseEventSource source = Qt::MouseEventNotSynthesized) override;
     void handleXIEnterLeave(xcb_ge_event_t *) override;
 #endif
@@ -159,14 +159,8 @@ public:
 
     static void setWindowIconTextStatic(QWindow *window, const QString &text);
 
-    static void setParentRelativeBackPixmapStatic(QWindow *window);
     void setParentRelativeBackPixmap();
-
-    static bool requestSystemTrayWindowDockStatic(const QWindow *window);
-    bool requestSystemTrayWindowDock() const;
-
-    static QRect systemTrayWindowGlobalGeometryStatic(const QWindow *window);
-    QRect systemTrayWindowGlobalGeometry() const;
+    bool requestSystemTrayWindowDock();
     uint visualId() const;
 
     bool needsSync() const;
@@ -179,9 +173,12 @@ public:
     bool startSystemMoveResize(const QPoint &pos, int corner);
     void doStartSystemMoveResize(const QPoint &globalPos, int corner);
 
+    bool isTrayIconWindow() const { return m_trayIconWindow; }
+
     virtual void create();
     virtual void destroy();
 
+    static void setWindowTitle(const QXcbConnection *conn, xcb_window_t window, const QString &title);
     static QString windowTitle(const QXcbConnection *conn, xcb_window_t window);
 
 public Q_SLOTS:
@@ -220,8 +217,6 @@ protected:
     void doFocusIn();
     void doFocusOut();
 
-    bool compressExposeEvent(QRegion &exposeRegion);
-
     void handleButtonPressEvent(int event_x, int event_y, int root_x, int root_y,
                                 int detail, Qt::KeyboardModifiers modifiers, xcb_timestamp_t timestamp,
                                 QEvent::Type type, Qt::MouseEventSource source = Qt::MouseEventNotSynthesized);
@@ -252,15 +247,13 @@ protected:
 
     Qt::WindowStates m_windowState = Qt::WindowNoState;
 
-    xcb_gravity_t m_gravity = XCB_GRAVITY_STATIC;
-
     bool m_mapped = false;
     bool m_transparent = false;
-    bool m_usingSyncProtocol = false;
     bool m_deferredActivation = false;
     bool m_embedded = false;
     bool m_alertState = false;
     bool m_minimized = false;
+    bool m_trayIconWindow = false;
     xcb_window_t m_netWmUserTimeWindow = XCB_NONE;
 
     QSurfaceFormat m_format;