From 593e8c671361ba5a1229001ce9d1da92f4aae842 Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Fri, 31 May 2019 09:29:17 +0200
Subject: Have all VCL plugin related defines in config_vclplug.h

Add the 'ENABLE_GTK3' and 'ENABLE_QT5' there
to allow using sth like

    #include <config_vclplug.h>
    #if ENABLE_GTK3
    // your code here
    #endif

for these as well.

Remove 'config_gtk3_kde5.h{,.in}', 'config_kde5.h{,.in}'
and 'config_qt5.h{,.in}'; they aren't included anywhere.
('QT5_HAVE_GLIB' is only used in Makefiles, so there's no
need to have it in a config header and 'KDE5_HAVE_GLIB' is
not used anywhere at all.)

Change-Id: Iea7906880f57dde782c50f2520e8d9b358f6bc82
Reviewed-on: https://gerrit.libreoffice.org/73204
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
---
 config_host/config_gtk3_kde5.h.in | 10 ----------
 config_host/config_kde5.h.in      | 10 ----------
 config_host/config_qt5.h.in       | 11 -----------
 config_host/config_vclplug.h.in   |  6 ++++--
 4 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 config_host/config_gtk3_kde5.h.in
 delete mode 100644 config_host/config_kde5.h.in
 delete mode 100644 config_host/config_qt5.h.in

(limited to 'config_host')

diff --git a/config_host/config_gtk3_kde5.h.in b/config_host/config_gtk3_kde5.h.in
deleted file mode 100644
index 06c672d4bb69..000000000000
--- a/config_host/config_gtk3_kde5.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-Settings for GTK3/KDE5 integration.
-*/
-
-#ifndef CONFIG_GTK3_KDE5_H
-#define CONFIG_GTK3_KDE5_H
-
-#define ENABLE_GTK3_KDE5 0
-
-#endif
diff --git a/config_host/config_kde5.h.in b/config_host/config_kde5.h.in
deleted file mode 100644
index af42a5edcf6a..000000000000
--- a/config_host/config_kde5.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-Settings for KDE5 integration.
-*/
-
-#ifndef CONFIG_KDE5_H
-#define CONFIG_KDE5_H
-
-#define KDE5_HAVE_GLIB 0
-
-#endif
diff --git a/config_host/config_qt5.h.in b/config_host/config_qt5.h.in
deleted file mode 100644
index 51bb58566f2b..000000000000
--- a/config_host/config_qt5.h.in
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
-Settings for QT5 integration.
-*/
-
-#ifndef CONFIG_QT5_H
-#define CONFIG_QT5_H
-
-#define ENABLE_QT5 0
-#define QT5_HAVE_GLIB 0
-
-#endif
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index 5bd9b4b98fe4..0b9ca095e5ec 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -1,6 +1,6 @@
 /*
 
-Settings about which X11 desktops have support enabled.
+Settings about which desktops have support enabled.
 
 */
 
@@ -8,7 +8,9 @@ Settings about which X11 desktops have support enabled.
 #define CONFIG_VCLPLUG_H
 
 #define ENABLE_GTK 0
-#define ENABLE_KDE5 0
+#define ENABLE_GTK3 0
 #define ENABLE_GTK3_KDE5 0
+#define ENABLE_KDE5 0
+#define ENABLE_QT5 0
 
 #endif
-- 
cgit v1.2.3