mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-27 11:52:25 +00:00
Win installer. update Qt
- Qt 5.6.3 uses a different path name scheme - one DLL as removed in Qt 5.6.3
This commit is contained in:
parent
108deae543
commit
22ff59c9ca
@ -4,6 +4,8 @@
|
||||
- updated to ImageMagick 7.0.6-2
|
||||
- updated to Perl 5.24.2.1
|
||||
- updated to Python 2.7.14
|
||||
- updated to Qt 5.6.3
|
||||
- updated to Ghostscript 9.22
|
||||
|
||||
|
||||
Changelog for LyX-223-1:
|
||||
|
@ -28,7 +28,6 @@ Lists of files to include in the installer
|
||||
|
||||
!macro FileListQtImageformats COMMAND DIRECTORY
|
||||
|
||||
${FILE}qdds.dll"
|
||||
${FILE}qgif.dll"
|
||||
${FILE}qicns.dll"
|
||||
${FILE}qico.dll"
|
||||
|
@ -41,7 +41,7 @@ These typically need to be modified for each LyX release
|
||||
|
||||
!define FILES_LYX "D:\LyXPackage2.2\LyX"
|
||||
!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
|
||||
!define FILES_QT "C:\Qt\Qt5.6.2-MSVC-2015\5.6\msvc2015"
|
||||
!define FILES_QT "C:\Qt\Qt5.6.3\5.6.3\msvc2015"
|
||||
!define ClassFileDir "${FILES_LYX}\Resources\tex"
|
||||
!define DVIPostFileDir "${FILES_DEPS}\tex"
|
||||
|
||||
|
@ -33,7 +33,7 @@ REM Save path
|
||||
set CALLED_FROM=%CD%
|
||||
|
||||
REM Add path to qmake here or set PATH correctly on your system.
|
||||
set PATH=C:\Qt\Qt5.6.1-MSVC2015-x64\5.6\msvc2015_64\bin;%PATH%
|
||||
set PATH=C:\Qt\Qt5.6.3\5.6.3\msvc2015_64\bin;%PATH%
|
||||
|
||||
REM Edit pathes here or set the environment variables on your system.
|
||||
set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64
|
||||
|
@ -33,7 +33,7 @@ REM Save path
|
||||
set CALLED_FROM=%CD%
|
||||
|
||||
REM Add path to qmake here or set PATH correctly on your system.
|
||||
set PATH=C:\Qt\Qt5.6.2-MSVC2015\5.6\msvc2015\bin;%PATH%
|
||||
set PATH=C:\Qt\Qt5.6.3\5.6.3\msvc2015\bin;%PATH%
|
||||
|
||||
REM Edit pathes here or set the environment variables on your system.
|
||||
set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015
|
||||
|
Loading…
Reference in New Issue
Block a user