[Libreoffice-commits] core.git: shell/Library_kde5be.mk vcl/Library_vclplug_kde5.mk vcl/Library_vclplug_qt5.mk

Michael Weghorn (via logerrit) logerrit at kemper.freedesktop.org
Wed Jun 12 21:17:43 UTC 2019


 shell/Library_kde5be.mk     |    2 +-
 vcl/Library_vclplug_kde5.mk |    2 +-
 vcl/Library_vclplug_qt5.mk  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 66b856dc557168a5839c256e7134c895985a908a
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Jun 12 16:32:53 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Wed Jun 12 23:15:42 2019 +0200

    Use 'gb_Library_add_cxxflags' for '-include chrono'
    
    Rationale is the same as in described in commit
    4aa60490622cc10f8d3a31489c62a5622d240c83
    ("gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not defines").
    
    Change-Id: I1253e33118956b72561bd56bbc668ca345006c37
    Reviewed-on: https://gerrit.libreoffice.org/73700
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/shell/Library_kde5be.mk b/shell/Library_kde5be.mk
index 39fdaf884409..a89892dee17f 100644
--- a/shell/Library_kde5be.mk
+++ b/shell/Library_kde5be.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Library_add_exception_objects,kde5be1,\
 # Workaround for clang+icecream (clang's -frewrite-includes
 # doesn't handle Qt5's QT_HAS_INCLUDE that Qt5 uses for <chrono>).
 ifeq ($(COM_IS_CLANG),TRUE)
-$(eval $(call gb_Library_add_defs,kde5be1, \
+$(eval $(call gb_Library_add_cxxflags,kde5be1, \
     -include chrono \
 ))
 endif
diff --git a/vcl/Library_vclplug_kde5.mk b/vcl/Library_vclplug_kde5.mk
index 181a318ab797..8b5804185b3e 100644
--- a/vcl/Library_vclplug_kde5.mk
+++ b/vcl/Library_vclplug_kde5.mk
@@ -94,7 +94,7 @@ endif
 # Workaround for clang+icecream (clang's -frewrite-includes
 # doesn't handle Qt5's QT_HAS_INCLUDE that Qt5 uses for <chrono>).
 ifeq ($(COM_IS_CLANG),TRUE)
-$(eval $(call gb_Library_add_defs,vclplug_kde5, \
+$(eval $(call gb_Library_add_cxxflags,vclplug_kde5, \
     -include chrono \
 ))
 endif
diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 543a4569ceb9..1a0546488bcd 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -123,7 +123,7 @@ endif
 # Workaround for clang+icecream (clang's -frewrite-includes
 # doesn't handle Qt5's QT_HAS_INCLUDE that Qt5 uses for <chrono>).
 ifeq ($(COM_IS_CLANG),TRUE)
-$(eval $(call gb_Library_add_defs,vclplug_qt5, \
+$(eval $(call gb_Library_add_cxxflags,vclplug_qt5, \
     -include chrono \
 ))
 endif


More information about the Libreoffice-commits mailing list