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

[Libreoffice Gerrit user]

 shell/Library_kde5be.mk     |    8 ++++++++
 vcl/Library_vclplug_kde5.mk |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 0a20339351dcbc75599df4e97626204c4cce8fb1
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Feb 4 16:25:58 2019 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Feb 4 17:45:11 2019 +0100

    workaround to make Qt5 code build with Clang+icecream (#2)
    
    This fixes and extends dad7c2213979695cf3573a130309206191b45157 .
    
    Change-Id: I29352d4b4809aa254e832a932bfeb595d065565b
    Reviewed-on: https://gerrit.libreoffice.org/67368
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/shell/Library_kde5be.mk b/shell/Library_kde5be.mk
index b9c7c903a745..39fdaf884409 100644
--- a/shell/Library_kde5be.mk
+++ b/shell/Library_kde5be.mk
@@ -29,4 +29,12 @@ $(eval $(call gb_Library_add_exception_objects,kde5be1,\
     shell/source/backends/kde5be/kde5backend \
 ))
 
+# 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, \
+    -include chrono \
+))
+endif
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/vcl/Library_vclplug_kde5.mk b/vcl/Library_vclplug_kde5.mk
index 2d2a8a920a1c..704557150ae5 100644
--- a/vcl/Library_vclplug_kde5.mk
+++ b/vcl/Library_vclplug_kde5.mk
@@ -97,7 +97,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_defs,vclplug_kde5, \
     -include chrono \
 ))
 endif