From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sun, 15 Oct 2017 14:47:48 +0000 (+0200)
Subject: Win installer: update Qt
X-Git-Tag: 2.3.0rc1~43
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1940a1f080733772315d3370fb03b3ac05fa3168;p=features.git

Win installer: update Qt

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

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index aed3a53b1f..0aea0df816 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,9 +1,11 @@
 Changelog for LyX-230-beta1:
 - installs LyX 2.3.0 beta1
 - updated to MiKTeX 2.9 build 6361
+- updated to Qt 5.6.3
 - updated to ImageMagick 7.0.6-7
 - updated to Perl 5.24.2.1
 - updated to NSIS 3.0.2.1
+- updated to Ghostscript 9.22
 - updated thesaurus for Ukrainian
 - updated spell checker dictionaries for English (GB), Portuguese, Scottish and
   Ukrainian
diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index 20342ca862..7d5dfd6a97 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"
@@ -57,9 +56,6 @@ Lists of files to include in the installer
 
 !macro FileListMSVC COMMAND DIRECTORY
 
-  # Files needed for MSVC 2010
-  ${FILE}msvcr100.dll"
-  ${FILE}msvcp100.dll"
   # Files needed for MSVC 2015
   ${FILE}concrt140.dll"
   ${FILE}msvcp140.dll"
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index cd251157f5..52fa4c0e8c 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.3\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-installer.bat b/development/cmake/build5-2015-installer.bat
index 4a76c4b575..4411d74660 100644
--- a/development/cmake/build5-2015-installer.bat
+++ b/development/cmake/build5-2015-installer.bat
@@ -5,7 +5,7 @@ REM Create a link and add  cmd.exe /k  in the preferences in front of the mingw.
 ::echo off
 
 REM Install Qt from qt.io
-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%
 
 set LYX_SOURCE=%~DP0..\..
 set LYX_BUILD=%LYX_SOURCE%\..\build-result-5-2015
diff --git a/development/cmake/build5-2015-x64.bat b/development/cmake/build5-2015-x64.bat
index 759159e5cf..cce1edd7f6 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 ab99a90087..420c752e38 100644
--- a/development/cmake/build5-2015.bat
+++ b/development/cmake/build5-2015.bat
@@ -34,7 +34,7 @@ set CALLED_FROM=%CD%
 
 REM Edit pathes here or set the environment variables on your system.
 set CMAKE_PATH="C:\Program Files\CMake\bin"
-set QT_PATH="C:\Qt\Qt5.6.2-MSVC-2015\5.6\msvc2015\bin"
+set QT_PATH="C:\Qt\Qt5.6.3\5.6.3\msvc2015\bin"
 set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2015"
 set LYX_SOURCE="D:\LyXGit\2.3.x"
 set LYX_BUILD="D:\LyXGit\2.3.x\compile-2015"