diff --git a/install.pri b/install.pri index 1693fff38..8f1b63823 100644 --- a/install.pri +++ b/install.pri @@ -54,10 +54,6 @@ 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] } @@ -68,9 +64,15 @@ for (LIBRARY, QT5_LIBRARIES) { qt5_target.files *= $${LIBRARY_PATH} } -for (LIBRARY, ICU_LIBRARIES) { - LIBRARY_PATH = $${QT5_LIBRARY_DIR}/$${LIBRARY} - exists($$LIBRARY_PATH): 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} + } } INSTALLS += qt5_target diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml index 63f028862..b5601b402 100644 --- a/installer/installbuilder/qt5-binaries.xml +++ b/installer/installbuilder/qt5-binaries.xml @@ -78,13 +78,13 @@ linux linux-x64 - ../../dist/lib/libicudata.so.56 + ../../dist/lib/libicudata.so.55 - ../../dist/lib/libicui18n.so.56 + ../../dist/lib/libicui18n.so.55 - ../../dist/lib/libicuuc.so.56 + ../../dist/lib/libicuuc.so.55 ../../dist/lib/libQt5Core.so.5