Win installer. update Qt

- Qt 5.6.3 uses a different path name scheme
- one DLL as removed in Qt 5.6.3

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index ec18b0c96ac2d648e04da7e178f0d5f23fa46fe3..b29eefa0441efce132f8687c2cdfcb33137f62e6 100644 (file)
--- 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 20342ca8624bfe057b71353eff4700f060de5572..e08f353748bcba8d54722fb12e653715faf7f4b2 100644 (file)
--- 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 80eb49d7590569a682f84dbc9711506404902175..d0f35de5426f3ece2709ba02ea50ca8a9ff9716a 100644 (file)
--- 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 16ecd27df2d7b4c29ebee6f6c3bb9dd153c18dda..9d60ee17bf4c402a8216cd1bb60940aef589bd16 100644 (file)
--- 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 6f87067fb3d875ee2c26136e3f7cb234af72d1d8..9f6df73b6b61eccb246c2aed61ce9dd66faa1c4a 100644 (file)
--- 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