From 7864c01c77b32c2fdfcec89a888735bf615c95e6 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 5 Sep 2023 11:49:29 +0200 Subject: [PATCH] widget: set WA_X11NetWmWindowType* after xcb window was created This amends 17d68c4fc371c32bd58d0a94ac63f0170edaf29e. Fixes: QTBUG-116696 Task-number: QTBUG-39887 Change-Id: Idf385bcbeb630ddfc51b39b2af35da3ab94b07c0 Reviewed-by: Axel Spoerl Reviewed-by: Qt CI Bot (cherry picked from commit 29b076d6143f8a4aede72c176efcc40e5b7d701e) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/kernel/qwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 1e4ee60e599..6b166778042 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1271,7 +1271,6 @@ void QWidgetPrivate::create() win->setProperty("_q_showWithoutActivating", QVariant(true)); if (q->testAttribute(Qt::WA_MacAlwaysShowToolWindow)) win->setProperty("_q_macAlwaysShowToolWindow", QVariant(true)); - setNetWmWindowTypes(true); // do nothing if none of WA_X11NetWmWindowType* is set win->setFlags(flags); fixPosIncludesFrame(); if (q->testAttribute(Qt::WA_Moved) @@ -1361,6 +1360,7 @@ void QWidgetPrivate::create() Q_ASSERT(id != WId(0)); setWinId(id); } + setNetWmWindowTypes(true); // do nothing if none of WA_X11NetWmWindowType* is set // Check children and create windows for them if necessary q_createNativeChildrenAndSetParent(q);