From 121e70e1877a999a800db52db800cc431e3477f2 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Mon, 19 Sep 2016 16:36:17 +0200
Subject: [PATCH] Enable installing of ICU on Linux

Since 5.6.1 is now available on Jenkins, installing of ICU can finally
be activated.
---
 install.pri                               | 7 +++----
 installer/installbuilder/qt5-binaries.xml | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/install.pri b/install.pri
index 822002ddc..3d3c12ca8 100644
--- a/install.pri
+++ b/install.pri
@@ -47,10 +47,9 @@ else:unix: {
     QT5_LIBRARIES *= libQt5Xml.so.5
     QT5_LIBRARIES *= libqgsttools_p.so.1
 
-# Todo: ICU is necessary on Linux. Uncomment lines below when 5.6.1 is built with ICU enabled on Jenkins
-#    QT5_LIBRARIES *= libicui18n.so.56
-#    QT5_LIBRARIES *= libicuuc.so.56
-#    QT5_LIBRARIES *= libicudata.so.56
+    QT5_LIBRARIES *= libicui18n.so.56
+    QT5_LIBRARIES *= libicuuc.so.56
+    QT5_LIBRARIES *= libicudata.so.56
 
     qt5_target.path = $${PREFIX}/lib
     QT5_LIBRARY_DIR = $$[QT_INSTALL_LIBS]
diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml
index fdd1303ae..9c3c3ecd6 100644
--- a/installer/installbuilder/qt5-binaries.xml
+++ b/installer/installbuilder/qt5-binaries.xml
@@ -80,7 +80,6 @@
             <name>lib_linux</name>
             <platforms>linux linux-x64</platforms>
             <distributionFileList>
-            <!-- Disable icu until Jenkins Qt5 is linked against it.
                 <distributionFile>
                     <origin>../../dist/lib/libicudata.so.56</origin>
                 </distributionFile>
@@ -90,7 +89,6 @@
                 <distributionFile>
                     <origin>../../dist/lib/libicuuc.so.56</origin>
                 </distributionFile>
-				-->
                 <distributionFile>
                     <origin>../../dist/lib/libQt5Core.so.5</origin>
                 </distributionFile>