From 4a900b850bb6a3512e929dcb15073058a15c5082 Mon Sep 17 00:00:00 2001
From: Philipp Storz <philipp.storz@bareos.com>
Date: Mon, 23 Sep 2019 12:37:29 +0200
Subject: [PATCH] Revert "removed icu from qt libs to save space"

This reverts commit fffe2f0df47e5acf65860497d0f73260e2308bb3.

(cherry picked from commit c7c32d3dce842c94dfa2b030a6657e34b9eb7dab)
---
 core/platforms/win32/winbareos-nsi.spec |  8 +++++---
 core/platforms/win32/winbareos.nsi      | 18 ++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/core/platforms/win32/winbareos-nsi.spec b/core/platforms/win32/winbareos-nsi.spec
index b32dd7618b3..37dfe64012a 100644
--- a/core/platforms/win32/winbareos-nsi.spec
+++ b/core/platforms/win32/winbareos-nsi.spec
@@ -70,9 +70,8 @@ BuildRequires:  mingw64-libwinpthread1
 BuildRequires:  mingw32-libqt5-qtbase
 BuildRequires:  mingw64-libqt5-qtbase
 
-# needs to be added if qt is built with icu support
-#BuildRequires:  mingw32-icu
-#BuildRequires:  mingw64-icu
+BuildRequires:  mingw32-icu
+BuildRequires:  mingw64-icu
 
 
 BuildRequires:  mingw32-lzo
@@ -180,6 +179,9 @@ for flavor in %{flavors}; do
       Qt5Core.dll \
       Qt5Gui.dll \
       Qt5Widgets.dll \
+      icui18n56.dll \
+      icudata56.dll \
+      icuuc56.dll \
       libfreetype-6.dll \
       libglib-2.0-0.dll \
       libintl-8.dll \
diff --git a/core/platforms/win32/winbareos.nsi b/core/platforms/win32/winbareos.nsi
index cb94c4ae32c..a24ade52186 100644
--- a/core/platforms/win32/winbareos.nsi
+++ b/core/platforms/win32/winbareos.nsi
@@ -941,12 +941,9 @@ SectionIn 1 2 3
   File "Qt5Core.dll"
   File "Qt5Gui.dll"
   File "Qt5Widgets.dll"
-
-# needs to be added if qt is built with icu support
-#  File "icui18n56.dll"
-#  File "icudata56.dll"
-#  File "icuuc56.dll"
-
+  File "icui18n56.dll"
+  File "icudata56.dll"
+  File "icuuc56.dll"
   File "libfreetype-6.dll"
   File "libglib-2.0-0.dll"
   File "libintl-8.dll"
@@ -2176,12 +2173,9 @@ ConfDeleteSkip:
   Delete "$INSTDIR\Qt5Core.dll"
   Delete "$INSTDIR\Qt5Gui.dll"
   Delete "$INSTDIR\Qt5Widgets.dll"
-
-# needs to be added if qt is built with icu support
-#  Delete "$INSTDIR\icui18n56.dll"
-#  Delete "$INSTDIR\icudata56.dll"
-#  Delete "$INSTDIR\icuuc56.dll"
-
+  Delete "$INSTDIR\icui18n56.dll"
+  Delete "$INSTDIR\icudata56.dll"
+  Delete "$INSTDIR\icuuc56.dll"
   Delete "$INSTDIR\libfreetype-6.dll"
   Delete "$INSTDIR\libglib-2.0-0.dll"
   Delete "$INSTDIR\libintl-8.dll"