From: Uwe Stöhr Date: Thu, 23 Nov 2017 23:13:11 +0000 (+0100) Subject: Win installer: update to Qt 5.9.3 X-Git-Tag: 2.3.0rc2~222 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b95800898d7ae03609178a40899a1d3340c039f6;p=features.git Win installer: update to Qt 5.9.3 --- 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"