From 5366e2e1cf0eb1c0296c7077f32f8bdc1593f39a Mon Sep 17 00:00:00 2001
From: Roland Rossgotterer <roland.rossgotterer@gmail.com>
Date: Mon, 3 Feb 2020 15:27:10 +0100
Subject: [PATCH] Revert 8c7475f620b356f4942367b7da6996933f8537d9 after upgrade
 to Qt 5.14.0

---
 install.pri                               | 15 +++++++--------
 installer/installbuilder/qt5-binaries.xml |  6 +++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/install.pri b/install.pri
index 4c1418ccf..836979a04 100644
--- a/install.pri
+++ b/install.pri
@@ -54,6 +54,10 @@ else:unix: {
     QT5_LIBRARIES *= libQt5Xml.so.5
     QT5_LIBRARIES *= libQt5MultimediaGstTools.so.5
 
+    ICU_LIBRARIES *= libicui18n.so.56
+    ICU_LIBRARIES *= libicuuc.so.56
+    ICU_LIBRARIES *= libicudata.so.56
+
     qt5_target.path = $${PREFIX}/lib
     QT5_LIBRARY_DIR = $$[QT_INSTALL_LIBS]
 }
@@ -64,15 +68,10 @@ for (LIBRARY, QT5_LIBRARIES) {
     qt5_target.files *= $${LIBRARY_PATH}
 }
 
-unix {
-    ICU_LIBRARIES *= libicui18n.so.55
-    ICU_LIBRARIES *= libicuuc.so.55
-    ICU_LIBRARIES *= libicudata.so.55
 
-    for (LIBRARY, ICU_LIBRARIES) {
-        LIBRARY_PATH = /opt/icu55/$${LIBRARY}
-        exists($$LIBRARY_PATH): qt5_target.files *= $${LIBRARY_PATH}
-    }
+for (LIBRARY, ICU_LIBRARIES) {
+    LIBRARY_PATH = $${QT5_LIBRARY_DIR}/$${LIBRARY}
+    exists($$LIBRARY_PATH): qt5_target.files *= $${LIBRARY_PATH}
 }
 
 INSTALLS += qt5_target
diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml
index 2dc2f4d6d..90af2da13 100644
--- a/installer/installbuilder/qt5-binaries.xml
+++ b/installer/installbuilder/qt5-binaries.xml
@@ -79,13 +79,13 @@
             <platforms>linux linux-x64</platforms>
             <distributionFileList>
                 <distributionFile>
-                    <origin>../../dist/lib/libicudata.so.55</origin>
+                    <origin>../../dist/lib/libicudata.so.56</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/lib/libicui18n.so.55</origin>
+                    <origin>../../dist/lib/libicui18n.so.56</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/lib/libicuuc.so.55</origin>
+                    <origin>../../dist/lib/libicuuc.so.56</origin>
                 </distributionFile>
                 <distributionFile>
                     <origin>../../dist/lib/libQt5Core.so.5</origin>