diff options
author | Aleix Pol <aleixpol@kde.org> | 2014-07-28 17:52:26 +0200 |
---|---|---|
committer | Robin Burchell <robin+qt@viroteck.net> | 2014-07-29 02:17:28 +0200 |
commit | 87242756d44b6c1b697290b583484550694a9695 (patch) | |
tree | 749395d70f06825ae4db5369a1639f15ef83e3b0 | |
parent | 61fecb23c2adaf50eb7b55fa85ec94a5bbc9f69a (diff) |
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 <laszlo.agocs@digia.com>
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 6 |
1 files 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<int>()); - setWmWindowType(wmWindowTypes); + if (window()->metaObject()->indexOfProperty(wm_window_type_property_id) >= 0) { + QXcbWindowFunctions::WmWindowTypes wmWindowTypes(window()->property(wm_window_type_property_id).value<int>()); + setWmWindowType(wmWindowTypes); + } if (connection()->time() != XCB_TIME_CURRENT_TIME) updateNetWmUserTime(connection()->time()); |