From ec045a09a4d04fde3ae0bf36233d7913d8b37a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= Date: Wed, 4 Nov 2020 13:24:55 +0100 Subject: [PATCH] updated windows release script to qt 5.14 --- release_scripts/windows/OpenBoard.iss | 12 ++++++------ release_scripts/windows/release.win7.vc9.bat | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/release_scripts/windows/OpenBoard.iss b/release_scripts/windows/OpenBoard.iss index 7a1a36e1..5e38d351 100644 --- a/release_scripts/windows/OpenBoard.iss +++ b/release_scripts/windows/OpenBoard.iss @@ -87,6 +87,12 @@ Source: "{#QtLibs}\libGLESv2.dll"; DestDir: "{app}" Source: "{#QtLibs}\Qt5Quick.dll"; DestDir: "{app}" Source: "{#QtLibs}\Qt5Positioning.dll"; DestDir: "{app}" Source: "{#QtLibs}\Qt5Sensors.dll"; DestDir: "{app}" +Source: "{#QtLibs}\icuuc65.dll"; DestDir: "{app}" +Source: "{#QtLibs}\icuin65.dll"; DestDir: "{app}" +Source: "{#QtLibs}\icudt65.dll"; DestDir: "{app}" +Source: "{#QtLibs}\libxslt.dll"; DestDir: "{app}" +Source: "{#QtLibs}\libxml2.dll"; DestDir: "{app}" +Source: "{#QtLibs}\Qt5QmlModels.dll"; DestDir: "{app}" Source: "{#QtLibs}\Qt5WebChannel.dll"; DestDir: "{app}" Source: "{#QtLibs}\libEGL.dll"; DestDir: "{app}" ;Source: "/etc/freezedWidgetWrapper.html"; DestDir: "{app}" @@ -94,12 +100,6 @@ Source: "{#QtLibs}\libEGL.dll"; DestDir: "{app}" Source: "{#ProjectRoot}\..\OpenBoard-ThirdParty\zlib\1.2.11\bin\zlib.dll"; DestDir:"{app}"; Flags: ignoreversion -Source: "{#ProjectRoot}\..\OpenBoard-ThirdParty\qtwebkit\bin\icudt64.dll"; DestDir: "{app}" -Source: "{#ProjectRoot}\..\OpenBoard-ThirdParty\qtwebkit\bin\icuin64.dll"; DestDir: "{app}" -Source: "{#ProjectRoot}\..\OpenBoard-ThirdParty\qtwebkit\bin\icuuc64.dll"; DestDir: "{app}" -Source: "{#ProjectRoot}\..\OpenBoard-ThirdParty\qtwebkit\bin\libxml2.dll"; DestDir: "{app}" -Source: "{#ProjectRoot}\..\OpenBoard-ThirdParty\qtwebkit\bin\libxslt.dll"; DestDir: "{app}" - ; NOTE: Don't use "Flags: ignoreversion" on any shared system files ;Qt windows plugins diff --git a/release_scripts/windows/release.win7.vc9.bat b/release_scripts/windows/release.win7.vc9.bat index 47f344d7..3682b9ff 100644 --- a/release_scripts/windows/release.win7.vc9.bat +++ b/release_scripts/windows/release.win7.vc9.bat @@ -19,7 +19,7 @@ set SCRIPT_PATH=%~dp0 set PROJECT_ROOT=%SCRIPT_PATH%\..\.. set APPLICATION_NAME=OpenBoard -set QT_DIR=C:\Qt\5.13.2\msvc2017_64 +set QT_DIR=C:\Qt\5.14.2\msvc2017_64 set QT_BIN=%QT_DIR%\bin set PROGRAMS_FILE_PATH=C:\Program Files (x86)