[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - config_host/config_gtk3_kde5.h.in config_host/config_kde5.h.in config_host/config_qt5.h.in config_host/config_vclplug.h.in configure.ac

[Michael Weghorn (via logerrit)]

 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 ++++--
 configure.ac                      |    5 +----
 5 files changed, 5 insertions(+), 37 deletions(-)

New commits:
commit d947042124d5027068395767e628845af944d005
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Fri May 31 09:29:17 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Sat Jun 15 09:28:26 2019 +0200

    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 at cib.de>
    (cherry picked from commit 593e8c671361ba5a1229001ce9d1da92f4aae842)
    Reviewed-on: https://gerrit.libreoffice.org/74080
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

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
diff --git a/configure.ac b/configure.ac
index 39dd082b8366..af54cc66fc44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10343,6 +10343,7 @@ if test "x$enable_gtk3" = "xyes"; then
     : ${with_system_cairo:=yes}
     PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.18 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
     if test "x$ENABLE_GTK3" = "xTRUE"; then
+        AC_DEFINE(ENABLE_GTK3)
         R="gtk3"
         dnl Avoid installed by unpackaged files for now.
         if test -z "$PKGFORMAT"; then
@@ -11285,7 +11286,6 @@ the root of your Qt installation by exporting QT5DIR before running "configure".
     PKG_CHECK_MODULES(QT5_GLIB,[glib-2.0 >= 2.4],
         [
             QT5_HAVE_GLIB=1
-            AC_DEFINE(QT5_HAVE_GLIB,1)
         ],
         AC_MSG_WARN([[No Glib found, Qt5 support will not use native file pickers!]])
     )
@@ -12866,9 +12866,6 @@ AC_CONFIG_HEADERS([config_host/config_liblangtag.h])
 AC_CONFIG_HEADERS([config_host/config_libnumbertext.h])
 AC_CONFIG_HEADERS([config_host/config_locales.h])
 AC_CONFIG_HEADERS([config_host/config_mpl.h])
-AC_CONFIG_HEADERS([config_host/config_qt5.h])
-AC_CONFIG_HEADERS([config_host/config_kde5.h])
-AC_CONFIG_HEADERS([config_host/config_gtk3_kde5.h])
 AC_CONFIG_HEADERS([config_host/config_oox.h])
 AC_CONFIG_HEADERS([config_host/config_options.h])
 AC_CONFIG_HEADERS([config_host/config_options_calc.h])