summaryrefslogtreecommitdiff
path: root/config_host
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2023-10-18 08:23:35 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2023-10-18 11:00:12 +0200
commit35ea75e9c2be75a70298a3f4e7d703c1d0f9497e (patch)
tree5456971c65d0c6e6771f88ac71307d00b1521e5b /config_host
parent502fbd79f9d71d01a177c3cd77256ed6a5a544d8 (diff)
qt: Drop now obsolete workaround for Qt < 5.12
This workaround was only applied for Qt < 5.12 and is no longer needed now that support for Qt < 5.15 has been dropped in commit afb4c96d271958ced3175dfc2cf8bb9e8b0a9d3b Author: Michael Weghorn <m.weghorn@posteo.de> Date: Thu Aug 3 21:30:22 2023 +0200 qt: Drop code for Qt < 5.15 Commit originally adding the workaround: commit fe2baf9e84e0ca9aeaa683e37076f57fa3f38dca Author: Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> Date: Tue Dec 3 08:32:58 2019 +0100 Qt5 fix missing XCB_ICCCM_WM_HINT_WINDOW_GROUP This is the application level equivalent of the Qt5 fix for bug QTBUG-46626 / commit 0de4b32 ("xcb: fix issue with dialogs hidden by other windows"), which was broken since Qt 5.4 and is just fixed since Qt 5.12. It is needed for some window managers, which don't know about the WM_CLIENT_LEADER property. Both settings are the same, but just the latter is set by older Qt5 releases. This probably isn't a real problem, as GNOME or XFCE would use the gtk VCL plugin, but since I already wrote the code when debugging tdf#129071, there is also no reason to drop it (except: more code, more bugs...). This fix is optional and needs development headers for xcb-icccm, which can actually be compiled into Qt5. If missing configure will just print a warning, since it's a runtime requirement and we explicitly drop the linked Qt version symbol, so the potential build Qt version won't matter. Change-Id: Ifc5a8f8a40ee13779a911efb53e8b8b868614d0b Reviewed-on: https://gerrit.libreoffice.org/84299 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Change-Id: I56b708449cf686f787f55256c76673be604d31e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158102 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'config_host')
-rw-r--r--config_host/config_vclplug.h.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index 63dacb1bc10e..2334288cd49d 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -31,7 +31,6 @@ Settings about which desktops have support enabled.
#define ENABLE_GSTREAMER_1_0 0
#define QT5_HAVE_GOBJECT 0
#define QT5_USING_X11 0
-#define QT5_HAVE_XCB_ICCCM 0
#define QT6_USING_X11 0
#endif