summaryrefslogtreecommitdiffstats
path: root/config_host/config_vclplug.h.in
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2019-06-14 02:08:22 +0000
committerMichael Weghorn <m.weghorn@posteo.de>2019-06-15 10:30:48 +0200
commit9c37c306158267d942a0a1debc3845db1c923ceb (patch)
treedcae1f46536a009de3499318f1d64c99a779cd80 /config_host/config_vclplug.h.in
parentHave all VCL plugin related defines in config_vclplug.h (diff)
downloadcore-9c37c306158267d942a0a1debc3845db1c923ceb.tar.gz
core-9c37c306158267d942a0a1debc3845db1c923ceb.zip
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>
Diffstat (limited to 'config_host/config_vclplug.h.in')
-rw-r--r--config_host/config_vclplug.h.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index 0b9ca095e5ec..5245a1ea7fb2 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -13,4 +13,6 @@ Settings about which desktops have support enabled.
#define ENABLE_KDE5 0
#define ENABLE_QT5 0
+#define QT5_USING_X11 0
+
#endif