diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index d1c358025a..8f9d140e8e 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -4,7 +4,7 @@ - correct display of installer text for many languages - fix bug that the BibTeX editor Jabref and the image editor Krita were not detected as 64bit application -- updated to Qt 5.9.2 +- updated to Qt 5.9.3 - updated to MiKTeX 2.9 build 6520 - updated to ImageMagick 7.0.7-8 - updated to Ghostscript 9.22 diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index a0079c688d..c4ee544ddb 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -14,7 +14,7 @@ These typically need to be modified for each LyX release !define APP_VERSION_REVISION 0 !define APP_VERSION_EMERGENCY "RC-1" # use "1" for an emergency release of LyX otherwise "" !define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise "" -!define APP_VERSION_BUILD 5 # Start with 1 for the installer releases of each version +!define APP_VERSION_BUILD 6 # Start with 1 for the installer releases of each version !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display @@ -38,7 +38,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.9.2\5.9.2\msvc2015" +!define FILES_QT "C:\Qt\Qt5.9.3\5.9.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 4411d74660..c0c4566537 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.3\5.6.3\msvc2015\bin;%PATH% +set PATH=C:\Qt\Qt5.9.3\5.9.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 aa7b3182d4..9ca66c9f0b 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.3\5.6.3\msvc2015_64\bin;%PATH% +set PATH=C:\Qt\Qt5.9.3\5.9.3\msvc2015_64;%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 fded326f3f..413ec5388c 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.3\5.6.3\msvc2015\bin" +set QT_PATH="C:\Qt\Qt5.9.3\5.9.3\msvc2015" set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2015" set LYX_SOURCE="D:\LyXGit\Master" set LYX_BUILD="D:\LyXGit\Master\compile-2015"