From ee76ce9447928919a340230f0f7b2fa357a9e520 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Wed, 3 Jun 2020 20:05:14 +0200
Subject: [PATCH] [windows] Update Qt to 5.12.8
---
windows-1809/base/Dockerfile | 4 ++--
windows-1809/base/qtifwsilent.qs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/windows-1809/base/Dockerfile b/windows-1809/base/Dockerfile
index ed274ec..2c880ce 100644
--- a/windows-1809/base/Dockerfile
+++ b/windows-1809/base/Dockerfile
@@ -31,13 +31,13 @@ ADD powershell/20-MSVC-15.9.ps1 /Windows/System32/WindowsPowerShell/v1.0/profile
COPY qtifwsilent.qs C:/qtifwsilent.qs
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
- (New-Object Net.WebClient).DownloadFile('https://download.qt.io/official_releases/qt/5.12/5.12.7/qt-opensource-windows-x86-5.12.7.exe', 'C:/qt.exe'); \
+ (New-Object Net.WebClient).DownloadFile('https://download.qt.io/official_releases/qt/5.12/5.12.8/qt-opensource-windows-x86-5.12.8.exe', 'C:/qt.exe'); \
$env:QT_INSTALL_DIR = 'C:/Qt'; \
Add-Content "\"/Windows/System32/drivers/etc/hosts\"" "\"`r`n127.0.0.1 iapi.qt.io`r`n::1 iapi.qt.io\""; \
Start-Process C:/qt.exe -NoNewWindow -Wait -ArgumentList '--verbose --script C:/qtifwsilent.qs'; \
Remove-Item -Force C:/qtifwsilent.qs; \
Remove-Item -Force C:/qt.exe; \
- [Environment]::SetEnvironmentVariable('Qt5_DIR', 'C:/Qt/5.12.7/msvc2017_64', [EnvironmentVariableTarget]::Machine)
+ [Environment]::SetEnvironmentVariable('Qt5_DIR', 'C:/Qt/5.12.8/msvc2017_64', [EnvironmentVariableTarget]::Machine)
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
(New-Object Net.WebClient).DownloadFile('https://www.baslerweb.com/fp-1551786641/media/downloads/software/pylon_software/Basler_pylon_5.2.0.13457.exe', 'C:/Basler_pylon_5.2.0.13457.exe'); \
diff --git a/windows-1809/base/qtifwsilent.qs b/windows-1809/base/qtifwsilent.qs
index f024852..35acdcc 100644
--- a/windows-1809/base/qtifwsilent.qs
+++ b/windows-1809/base/qtifwsilent.qs
@@ -25,8 +25,8 @@ Controller.prototype.TargetDirectoryPageCallback = function() {
Controller.prototype.ComponentSelectionPageCallback = function() {
var widget = gui.currentPageWidget();
widget.deselectAll();
- widget.selectComponent("qt.qt5.5127.win64_msvc2017_64");
- widget.selectComponent("qt.qt5.5127.qtcharts");
+ widget.selectComponent("qt.qt5.5128.win64_msvc2017_64");
+ widget.selectComponent("qt.qt5.5128.qtcharts");
gui.clickButton(buttons.NextButton);
}
--
GitLab