f7a299974b
- Add patches from upstream: 0001-Fix-QWidget-setWindowRole.patch 0002-xcb-Fix-getting-the-window-types-from-the-property-o.patch 0003-Fix-centering-dialogs.patch 0004-xcb-Set-_NET_WM_WINDOW_TYPE-from-a-single-place.patch 0005-Restore-documented-behavior-for-the-WA_X11NetWmWindo.patch 0006-xcb-set-SM_CLIENT_ID-property.patch OBS-URL: https://build.opensuse.org/request/show/311483 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=43
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 4bc7ce49d92e7a0647b7e2f42c649d4cfee10d74 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Volkov <a.volkov@rusbitech.ru>
|
|
Date: Thu, 7 May 2015 17:10:12 +0300
|
|
Subject: [PATCH 1/1] xcb: Fix getting the window types from the property of
|
|
QWindow
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
wm_window_type_property_id is a dynamic property, so we should
|
|
check that it is set by using QObject::dynamicPropertyNames()
|
|
instead of QMetaObject::indexOfProperty().
|
|
|
|
Change-Id: Ic7f3408a0d028f349538e0538c40c4b58360f7df
|
|
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
|
|
---
|
|
src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
|
|
index a6011aa654824c46f1e10c04dbc1b8d8c9c6658a..42a86ae8104641d24b0ce4dbd7418ad17bf8bd38 100644
|
|
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
|
|
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
|
|
@@ -762,7 +762,7 @@ void QXcbWindow::show()
|
|
updateNetWmStateBeforeMap();
|
|
}
|
|
|
|
- if (window()->metaObject()->indexOfProperty(wm_window_type_property_id) >= 0) {
|
|
+ if (window()->dynamicPropertyNames().contains(wm_window_type_property_id)) {
|
|
QXcbWindowFunctions::WmWindowTypes wmWindowTypes(window()->property(wm_window_type_property_id).value<int>());
|
|
setWmWindowType(wmWindowTypes);
|
|
}
|
|
--
|
|
2.4.2
|
|
|