anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win installer: update Qt

Browse Source 
- Qt 5.6.3 uses a different path name scheme
- one DLL was removed in Qt 5.6.3
This commit is contained in:
Uwe Stöhr 2017-10-15 16:47:48 +02:00
parent d7306b62ac
commit 1940a1f080
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,11 @@
Changelog for LyX-230-beta1: Changelog for LyX-230-beta1:
- installs LyX 2.3.0 beta1 - installs LyX 2.3.0 beta1
- updated to MiKTeX 2.9 build 6361 - updated to MiKTeX 2.9 build 6361
- updated to Qt 5.6.3
- updated to ImageMagick 7.0.6-7 - updated to ImageMagick 7.0.6-7
- updated to Perl 5.24.2.1 - updated to Perl 5.24.2.1
- updated to NSIS 3.0.2.1 - updated to NSIS 3.0.2.1
- updated to Ghostscript 9.22
- updated thesaurus for Ukrainian - updated thesaurus for Ukrainian
- updated spell checker dictionaries for English (GB), Portuguese, Scottish and - updated spell checker dictionaries for English (GB), Portuguese, Scottish and
Ukrainian Ukrainian

4
development/Win32/packaging/installer/include/filelist.nsh
View File

@ -28,7 +28,6 @@ Lists of files to include in the installer
!macro FileListQtImageformats COMMAND DIRECTORY !macro FileListQtImageformats COMMAND DIRECTORY
${FILE}qdds.dll"
${FILE}qgif.dll" ${FILE}qgif.dll"
${FILE}qicns.dll" ${FILE}qicns.dll"
${FILE}qico.dll" ${FILE}qico.dll"
@ -57,9 +56,6 @@ Lists of files to include in the installer
!macro FileListMSVC COMMAND DIRECTORY !macro FileListMSVC COMMAND DIRECTORY
# Files needed for MSVC 2010
${FILE}msvcr100.dll"
${FILE}msvcp100.dll"
# Files needed for MSVC 2015 # Files needed for MSVC 2015
${FILE}concrt140.dll" ${FILE}concrt140.dll"
${FILE}msvcp140.dll" ${FILE}msvcp140.dll"

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

@ -41,7 +41,7 @@ These typically need to be modified for each LyX release
!define FILES_LYX "D:\LyXPackage2.3\LyX" !define FILES_LYX "D:\LyXPackage2.3\LyX"
!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015" !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 ClassFileDir "${FILES_LYX}\Resources\tex"
!define DVIPostFileDir "${FILES_DEPS}\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 ::echo off
REM Install Qt from qt.io 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_SOURCE=%~DP0..\..
set LYX_BUILD=%LYX_SOURCE%\..\build-result-5-2015 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% set CALLED_FROM=%CD%
REM Add path to qmake here or set PATH correctly on your system. 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. REM Edit pathes here or set the environment variables on your system.
set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64 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. REM Edit pathes here or set the environment variables on your system.
set CMAKE_PATH="C:\Program Files\CMake\bin" 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 GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2015"
set LYX_SOURCE="D:\LyXGit\2.3.x" set LYX_SOURCE="D:\LyXGit\2.3.x"
set LYX_BUILD="D:\LyXGit\2.3.x\compile-2015" set LYX_BUILD="D:\LyXGit\2.3.x\compile-2015"