anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win installer: update to Qt 5.9.3

Browse Source
This commit is contained in:
Uwe Stöhr 2017-11-24 00:16:23 +01:00
parent 34285cc683
commit bf12cebdc0
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/Win32/packaging/installer/ChangeLog.txt
View File

@ -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

4
development/Win32/packaging/installer/settings.nsh
View File

@ -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"

2
development/cmake/build5-2015-installer.bat
View File

@ -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

2
development/cmake/build5-2015-x64.bat
View File

@ -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

2
development/cmake/build5-2015.bat
View File

@ -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"