flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 11:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable installing of ICU on Linux

Browse Source 
Since 5.6.1 is now available on Jenkins, installing of ICU can finally
be activated.
This commit is contained in:
Roland Winklmeier
2016-09-19 16:36:17 +02:00
parent fb3df51013
commit 121e70e187
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
install.pri
View File

@@ -47,10 +47,9 @@ else:unix: {
QT5_LIBRARIES *= libQt5Xml.so.5 QT5_LIBRARIES *= libQt5Xml.so.5
QT5_LIBRARIES *= libqgsttools_p.so.1 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 *= libicui18n.so.56 QT5_LIBRARIES *= libicuuc.so.56
# QT5_LIBRARIES *= libicuuc.so.56 QT5_LIBRARIES *= libicudata.so.56
# QT5_LIBRARIES *= libicudata.so.56
qt5_target.path = $${PREFIX}/lib qt5_target.path = $${PREFIX}/lib
QT5_LIBRARY_DIR = $$[QT_INSTALL_LIBS] QT5_LIBRARY_DIR = $$[QT_INSTALL_LIBS]

2
installer/installbuilder/qt5-binaries.xml
View File

@@ -80,7 +80,6 @@
<name>lib_linux</name> <name>lib_linux</name>
<platforms>linux linux-x64</platforms> <platforms>linux linux-x64</platforms>
<distributionFileList> <distributionFileList>
<!-- Disable icu until Jenkins Qt5 is linked against it.
<distributionFile> <distributionFile>
<origin>../../dist/lib/libicudata.so.56</origin> <origin>../../dist/lib/libicudata.so.56</origin>
</distributionFile> </distributionFile>
@@ -90,7 +89,6 @@
<distributionFile> <distributionFile>
<origin>../../dist/lib/libicuuc.so.56</origin> <origin>../../dist/lib/libicuuc.so.56</origin>
</distributionFile> </distributionFile>
-->
<distributionFile> <distributionFile>
<origin>../../dist/lib/libQt5Core.so.5</origin> <origin>../../dist/lib/libQt5Core.so.5</origin>
</distributionFile> </distributionFile>