From b5323c72ff7e5bcde34089e49fe98e589dcc5acb Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Fri, 14 Jun 2019 02:08:22 +0000 Subject: 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. Change-Id: I55c89c76726d30a890178488484e954207267e89 Reviewed-on: https://gerrit.libreoffice.org/74015 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- config_host/config_vclplug.h.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config_host') diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in index f634483173bb..28b71d47a70a 100644 --- a/config_host/config_vclplug.h.in +++ b/config_host/config_vclplug.h.in @@ -13,7 +13,8 @@ Settings about which desktops have support enabled. #define ENABLE_KDE5 0 #define ENABLE_QT5 0 -#define QT5_HAVE_GOBJECT 0 #define ENABLE_GSTREAMER_1_0 0 +#define QT5_HAVE_GOBJECT 0 +#define QT5_USING_X11 0 #endif -- cgit