[Libreoffice-commits] core.git: vcl/Executable_lo_kde5filepicker.mk vcl/Library_vclplug_kf5.mk

[Jan-Marek Glogowski (via logerrit)]

 vcl/Executable_lo_kde5filepicker.mk |    2 --
 vcl/Library_vclplug_kf5.mk          |   10 ----------
 2 files changed, 12 deletions(-)

New commits:
commit f00ad321cec3923b60604e7417b3661de9c314bf
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sun Jul 21 21:49:13 2019 +0000
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Mon Jul 22 00:43:54 2019 +0200

    Drop undefined QT5_GLIB_*
    
    These defines were removed in commit a6201725d760 ("Don't link
    avmediagst with gtk3 and qt5").
    
    Change-Id: I3e0f22c7e2f25ea2b69efa19124ab3feca3f0a15
    Reviewed-on: https://gerrit.libreoffice.org/76076
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/Executable_lo_kde5filepicker.mk b/vcl/Executable_lo_kde5filepicker.mk
index 7d44b3fca120..08f6b82ed928 100644
--- a/vcl/Executable_lo_kde5filepicker.mk
+++ b/vcl/Executable_lo_kde5filepicker.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_add_cxxflags,lo_kde5filepicker,\
     $$(INCLUDE) \
     $$(BOOST_CXXFLAGS) \
     $(QT5_CFLAGS) \
-    $(QT5_GLIB_CFLAGS) \
     $(KF5_CFLAGS) \
 ))
 
@@ -74,7 +73,6 @@ $(eval $(call gb_Executable_use_externals,lo_kde5filepicker,\
 
 $(eval $(call gb_Executable_add_libs,lo_kde5filepicker,\
     $(QT5_LIBS) \
-    $(QT5_GLIB_LIBS) \
     $(KF5_LIBS) \
     $(BOOST_PROCESS_LIB) \
     $(BOOST_FILESYSTEM_LIB) \
diff --git a/vcl/Library_vclplug_kf5.mk b/vcl/Library_vclplug_kf5.mk
index 62dafe2c2536..d10cecd167d5 100644
--- a/vcl/Library_vclplug_kf5.mk
+++ b/vcl/Library_vclplug_kf5.mk
@@ -61,16 +61,6 @@ $(eval $(call gb_Library_use_externals,vclplug_kf5,\
 	epoxy \
 ))
 
-ifneq ($(QT5_HAVE_GLIB),)
-$(eval $(call gb_Library_add_cxxflags,vclplug_kf5,\
-    $(QT5_GLIB_CFLAGS) \
-))
-
-$(eval $(call gb_Library_add_libs,vclplug_kf5,\
-    $(QT5_GLIB_LIBS) \
-))
-endif
-
 $(eval $(call gb_Library_add_cxxflags,vclplug_kf5,\
     $(KF5_CFLAGS) \
 ))