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

Revert 8c7475f620 after upgrade to Qt 5.14.0

Browse Source
This commit is contained in:
Roland Rossgotterer
2020-02-03 15:27:10 +01:00
committed by Mat Sutcliffe
parent f60a44ea1e
commit 5366e2e1cf
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
install.pri
View File

@@ -54,6 +54,10 @@ else:unix: {
QT5_LIBRARIES *= libQt5Xml.so.5 QT5_LIBRARIES *= libQt5Xml.so.5
QT5_LIBRARIES *= libQt5MultimediaGstTools.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_target.path = $${PREFIX}/lib
QT5_LIBRARY_DIR = $$[QT_INSTALL_LIBS] QT5_LIBRARY_DIR = $$[QT_INSTALL_LIBS]
} }
@@ -64,15 +68,10 @@ for (LIBRARY, QT5_LIBRARIES) {
qt5_target.files *= $${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) { for (LIBRARY, ICU_LIBRARIES) {
LIBRARY_PATH = /opt/icu55/$${LIBRARY} LIBRARY_PATH = $${QT5_LIBRARY_DIR}/$${LIBRARY}
exists($$LIBRARY_PATH): qt5_target.files *= $${LIBRARY_PATH} exists($$LIBRARY_PATH): qt5_target.files *= $${LIBRARY_PATH}
}
} }
INSTALLS += qt5_target INSTALLS += qt5_target

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

@@ -79,13 +79,13 @@
<platforms>linux linux-x64</platforms> <platforms>linux linux-x64</platforms>
<distributionFileList> <distributionFileList>
<distributionFile> <distributionFile>
<origin>../../dist/lib/libicudata.so.55</origin> <origin>../../dist/lib/libicudata.so.56</origin>
</distributionFile> </distributionFile>
<distributionFile> <distributionFile>
<origin>../../dist/lib/libicui18n.so.55</origin> <origin>../../dist/lib/libicui18n.so.56</origin>
</distributionFile> </distributionFile>
<distributionFile> <distributionFile>
<origin>../../dist/lib/libicuuc.so.55</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>