commit 22ff59c9cabec294a0c1b9723c520d0e30fdce43 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun Oct 15 16:41:50 2017 +0200
Win installer. update Qt - Qt 5.6.3 uses a different path name scheme - one DLL as removed in Qt 5.6.3 --- .../Win32/packaging/installer/ChangeLog.txt | 2 ++ .../Win32/packaging/installer/include/filelist.nsh | 1 - development/Win32/packaging/installer/settings.nsh | 2 +- development/cmake/build5-2015-x64.bat | 2 +- development/cmake/build5-2015.bat | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index ec18b0c..b29eefa 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -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: diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh index 20342ca..e08f353 100644 --- a/development/Win32/packaging/installer/include/filelist.nsh +++ b/development/Win32/packaging/installer/include/filelist.nsh @@ -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" diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 80eb49d..d0f35de 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -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" diff --git a/development/cmake/build5-2015-x64.bat b/development/cmake/build5-2015-x64.bat index 16ecd27..9d60ee1 100644 --- a/development/cmake/build5-2015-x64.bat +++ b/development/cmake/build5-2015-x64.bat @@ -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 diff --git a/development/cmake/build5-2015.bat b/development/cmake/build5-2015.bat index 6f87067..9f6df73 100644 --- a/development/cmake/build5-2015.bat +++ b/development/cmake/build5-2015.bat @@ -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