From 87242756d44b6c1b697290b583484550694a9695 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Mon, 28 Jul 2014 17:52:26 +0200 Subject: Don't reset the window type on window show We were resetting the window type on show, this was breaking some deployments, since it used to be possible to set the xcb properties from the user application. This change requires the user to at least start using the QtPlatformHeaders before overriding the window properties with the values set there. Change-Id: Ic58919a42b6d532035c7ec6158a086b85666a22f Reviewed-by: Laszlo Agocs --- src/plugins/platforms/xcb/qxcbwindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 578b4d6ec1..de39b9335c 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -723,8 +723,10 @@ void QXcbWindow::show() updateNetWmStateBeforeMap(); } - QXcbWindowFunctions::WmWindowTypes wmWindowTypes(window()->property(wm_window_type_property_id).value()); - setWmWindowType(wmWindowTypes); + if (window()->metaObject()->indexOfProperty(wm_window_type_property_id) >= 0) { + QXcbWindowFunctions::WmWindowTypes wmWindowTypes(window()->property(wm_window_type_property_id).value()); + setWmWindowType(wmWindowTypes); + } if (connection()->time() != XCB_TIME_CURRENT_TIME) updateNetWmUserTime(connection()->time()); -- cgit v1.2.3