anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable Qt6 for Wininstaller

Browse Source
This commit is contained in:
Eugene Chornyi 2021-05-27 18:51:30 +02:00
parent 814febbdf7
commit 764d59d882
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/Win32/packaging/installer/lyx_standard.nsi
View File

@ -15,6 +15,8 @@
!define FILES_QT "${FILES_LYX}" # Can choose same as FILES_LYX (if Qt files copied to LYX_INSTALLED folder after compiling) or Qt kit folder !define FILES_QT "${FILES_LYX}" # Can choose same as FILES_LYX (if Qt files copied to LYX_INSTALLED folder after compiling) or Qt kit folder
!define FILES_DEPS "${FILES_LYX}" # Can choose same as FILES_LYX (if dependencies copied to LYX_INSTALLED folder after compiling) or the dependencies folder itself (GNUWIN32 dir) !define FILES_DEPS "${FILES_LYX}" # Can choose same as FILES_LYX (if dependencies copied to LYX_INSTALLED folder after compiling) or the dependencies folder itself (GNUWIN32 dir)
!define Qt_Version 6 # 5 or 6 (4 is not supported)
!define COPYRIGHT_YEAR 2020 !define COPYRIGHT_YEAR 2020
#------------------------------------------------------------- #-------------------------------------------------------------

33
development/Win32/packaging/installer/src/main.nsh
View File

@ -591,15 +591,20 @@ Section -ProgramFiles
# Pdfview # Pdfview
File "${FILES_DEPS}\bin\pdfview.exe" File "${FILES_DEPS}\bin\pdfview.exe"
# Qt libraries # Qt libraries
File "${FILES_QT}\bin\Qt5Concurrent.dll" File "${FILES_QT}\bin\Qt${Qt_Version}Concurrent.dll"
File "${FILES_QT}\bin\Qt5Core.dll" File "${FILES_QT}\bin\Qt${Qt_Version}Core.dll"
File "${FILES_QT}\bin\Qt5Gui.dll" File "${FILES_QT}\bin\Qt${Qt_Version}Gui.dll"
File "${FILES_QT}\bin\Qt5Network.dll" File "${FILES_QT}\bin\Qt${Qt_Version}Network.dll"
File "${FILES_QT}\bin\Qt5OpenGL.dll" File "${FILES_QT}\bin\Qt${Qt_Version}OpenGL.dll"
File "${FILES_QT}\bin\Qt5PrintSupport.dll" File "${FILES_QT}\bin\Qt${Qt_Version}PrintSupport.dll"
File "${FILES_QT}\bin\Qt5Svg.dll" File "${FILES_QT}\bin\Qt${Qt_Version}Svg.dll"
File "${FILES_QT}\bin\Qt5Widgets.dll" File "${FILES_QT}\bin\Qt${Qt_Version}Widgets.dll"
File "${FILES_QT}\bin\Qt5WinExtras.dll" !if ${Qt_Version} = 5
File "${FILES_QT}\bin\Qt5WinExtras.dll"
!endif
!if ${Qt_Version} = 6
File "${FILES_DEPS}\bin\Qt6Core5Compat.dll"
!endif
# Qt plugin DLLs # Qt plugin DLLs
SetOutPath "$INSTDIR\bin\imageformats" SetOutPath "$INSTDIR\bin\imageformats"
@ -607,10 +612,12 @@ Section -ProgramFiles
File "${FILES_QT}\bin\imageformats\qico.dll" File "${FILES_QT}\bin\imageformats\qico.dll"
File "${FILES_QT}\bin\imageformats\qjpeg.dll" File "${FILES_QT}\bin\imageformats\qjpeg.dll"
File "${FILES_QT}\bin\imageformats\qsvg.dll" File "${FILES_QT}\bin\imageformats\qsvg.dll"
File "${FILES_QT}\bin\imageformats\qicns.dll" !if ${Qt_Version} = 5
File "${FILES_QT}\bin\imageformats\qtiff.dll" File "${FILES_QT}\bin\imageformats\qicns.dll"
File "${FILES_QT}\bin\imageformats\qwbmp.dll" File "${FILES_QT}\bin\imageformats\qtiff.dll"
File "${FILES_QT}\bin\imageformats\qwebp.dll" File "${FILES_QT}\bin\imageformats\qwbmp.dll"
File "${FILES_QT}\bin\imageformats\qwebp.dll"
!endif
SetOutPath "$INSTDIR\bin\iconengines" SetOutPath "$INSTDIR\bin\iconengines"
File "${FILES_QT}\bin\iconengines\qsvgicon.dll" File "${FILES_QT}\bin\iconengines\qsvgicon.dll"