From 08b3039464ac7ef850e5fec146ca1f738839f17b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Fri, 14 Oct 2016 00:36:28 +0200 Subject: [PATCH] Win installer: new version with Qt 5.6.2 --- development/Win32/packaging/installer/ChangeLog.txt | 7 ++++++- development/Win32/packaging/installer/settings.nsh | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index fd257e55e1..68b81388a9 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,4 +1,9 @@ -Changelog for LyX-222-1: +Changelog for LyX-222-2: +- updated to Qt 5.6.2-1 (fixes Windows-specific bugs) +- updated to Perl 5.22.2.1 + + +Changelog for LyX-222-1: - installs LyX 2.2.2 - updated to MiKTeX 2.9 build 6069 - updated to Imagemagick 7.0.3-3 diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 0e32bbf786..1b2930b299 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -11,10 +11,10 @@ These typically need to be modified for each LyX release !define APP_VERSION_MAJOR 2 !define APP_VERSION_MINOR 2 -!define APP_VERSION_REVISION 1 +!define APP_VERSION_REVISION 2 !define APP_VERSION_EMERGENCY "" # 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 3 # Start with 1 for the installer releases of each version +!define APP_VERSION_BUILD 2 # 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 @@ -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.1-MSVC2015\5.6\msvc2015" +!define FILES_QT "C:\Qt\Qt5.6.2-MSVC-2015\5.6\msvc2015" !define ClassFileDir "${FILES_LYX}\Resources\tex" !define DVIPostFileDir "${FILES_DEPS}\tex" -- 2.39.5