anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 19:59:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win installer. update Qt

Browse Source 
- Qt 5.6.3 uses a different path name scheme
- one DLL as removed in Qt 5.6.3
This commit is contained in:
Uwe Stöhr 2017-10-15 16:41:50 +02:00
parent 108deae543
commit 22ff59c9ca
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/Win32/packaging/installer/ChangeLog.txt
View File

@ -4,6 +4,8 @@
- updated to ImageMagick 7.0.6-2 - updated to ImageMagick 7.0.6-2
- updated to Perl 5.24.2.1 - updated to Perl 5.24.2.1
- updated to Python 2.7.14 - updated to Python 2.7.14
- updated to Qt 5.6.3
- updated to Ghostscript 9.22
Changelog for LyX-223-1: Changelog for LyX-223-1:

1
development/Win32/packaging/installer/include/filelist.nsh
View File

@ -28,7 +28,6 @@ Lists of files to include in the installer
!macro FileListQtImageformats COMMAND DIRECTORY !macro FileListQtImageformats COMMAND DIRECTORY
${FILE}qdds.dll"
${FILE}qgif.dll" ${FILE}qgif.dll"
${FILE}qicns.dll" ${FILE}qicns.dll"
${FILE}qico.dll" ${FILE}qico.dll"

2
development/Win32/packaging/installer/settings.nsh
View File

@ -41,7 +41,7 @@ These typically need to be modified for each LyX release
!define FILES_LYX "D:\LyXPackage2.2\LyX" !define FILES_LYX "D:\LyXPackage2.2\LyX"
!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015" !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 ClassFileDir "${FILES_LYX}\Resources\tex"
!define DVIPostFileDir "${FILES_DEPS}\tex" !define DVIPostFileDir "${FILES_DEPS}\tex"

2
development/cmake/build5-2015-x64.bat
View File

@ -33,7 +33,7 @@ REM Save path
set CALLED_FROM=%CD% set CALLED_FROM=%CD%
REM Add path to qmake here or set PATH correctly on your system. 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. REM Edit pathes here or set the environment variables on your system.
set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64 set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64

2
development/cmake/build5-2015.bat
View File

@ -33,7 +33,7 @@ REM Save path
set CALLED_FROM=%CD% set CALLED_FROM=%CD%
REM Add path to qmake here or set PATH correctly on your system. 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. REM Edit pathes here or set the environment variables on your system.
set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015 set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015