diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-14 02:08:22 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-06-19 10:55:25 +0200 |
| commit | 5525368c6640f54cc8080ab5e9f6621a3d3874d8 (patch) | |
| tree | adfea0cde0947c60e2b27e9863c26bfaeae274ea /config_host | |
| parent | 00705fb7a4fda6b862d78c87e2de60f8f65c5826 (diff) | |
KDE5 move screensafer inhibiting code into Qt5
There will presumably be more X11 specific code later to implement some
"fix" for tdf#119202. Moving the screensafer inhibitor is rather
uncontroversial in comparion, so start with it and use it to carry the
matching configure.ac changes.
A little "nightmare" are all the clashing X11 / Qt type undefs, but I
couldn't find a better solution while the inhibitor continues to
include the X11 headers in it's header.
Reviewed-on: https://gerrit.libreoffice.org/74015
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit b5323c72ff7e5bcde34089e49fe98e589dcc5acb)
Change-Id: I55c89c76726d30a890178488484e954207267e89
Reviewed-on: https://gerrit.libreoffice.org/74081
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit 9c37c306158267d942a0a1debc3845db1c923ceb)
Reviewed-on: https://gerrit.libreoffice.org/74192
(cherry picked from commit 3ff31faa48c12c33c9c3fafae8fc35201fa5d614)
Diffstat (limited to 'config_host')
| -rw-r--r-- | config_host/config_vclplug.h.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in index be9c136245ee..21200e57c9bd 100644 --- a/config_host/config_vclplug.h.in +++ b/config_host/config_vclplug.h.in @@ -12,4 +12,6 @@ Settings about which X11 desktops have support enabled. #define ENABLE_KDE5 0 #define ENABLE_GTK3_KDE5 0 +#define QT5_USING_X11 0 + #endif |