[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - RepositoryExternal.mk

Michael Weghorn (via logerrit) logerrit at kemper.freedesktop.org
Fri Jun 14 05:58:52 UTC 2019


 RepositoryExternal.mk |   12 ------------
 1 file changed, 12 deletions(-)

New commits:
commit bed1cab257bdc9f8e1b6fb52fd8dcd531a2e1431
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Jun 12 17:17:07 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Jun 14 07:58:11 2019 +0200

    Drop '-Wno-shadow' previously set for qt5/kde5
    
    The flag has been introduced with commit
    9335945c7cb215f387ed1444e28533fac437c6e8 ("KF5 initial VCL plugin")
    and was presumably just copy-pasted in commit
    4d78cf97d7b1629556df68fc461922fda930d9ec.
    
    The flag should no longer be necessary now; the only issue showing
    up after removing the flag was fixed.
    
    Change-Id: I65fe4d12bdf7d5888b75f8a5743bab6979a63295
    Reviewed-on: https://gerrit.libreoffice.org/73892
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 41a644dae966ecb958d1fe56cb14f3c091b0eceb)
    Reviewed-on: https://gerrit.libreoffice.org/73996

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b039484338a8..a75ca5097b62 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3092,12 +3092,6 @@ $(call gb_LinkTarget_add_libs,$(1),\
 	$(KF5_LIBS) \
 )
 
-ifeq ($(COM),GCC)
-$(call gb_LinkTarget_add_cxxflags,$(1),\
-	-Wno-shadow \
-)
-endif
-
 endef
 
 else # !ENABLE_KDE5
@@ -3126,12 +3120,6 @@ $(call gb_LinkTarget_add_libs,$(1),\
 	$(QT5_LIBS) \
 )
 
-ifeq ($(COM),GCC)
-$(call gb_LinkTarget_add_cxxflags,$(1),\
-       -Wno-shadow \
-)
-endif
-
 endef
 
 else # !ENABLE_QT5


More information about the Libreoffice-commits mailing list