From a739f182c206ad10c38fcd50c799ad29b375ce9f Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Mon, 4 Feb 2019 15:58:35 +0100
Subject: [PATCH] windows: update Qt to 5.12.1
---
windows/base/Dockerfile | 4 ++--
windows/base/qtifwsilent.qs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/windows/base/Dockerfile b/windows/base/Dockerfile
index 18f454c..5585230 100644
--- a/windows/base/Dockerfile
+++ b/windows/base/Dockerfile
@@ -24,12 +24,12 @@ COPY Profile.ps1 C:/Users/ContainerAdministrator/Documents/WindowsPowerShell/Mic
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.11/5.11.2/qt-opensource-windows-x86-5.11.2.exe', 'C:/qt.exe'); \
+ (New-Object Net.WebClient).DownloadFile('https://download.qt.io/official_releases/qt/5.12/5.12.1/qt-opensource-windows-x86-5.12.1.exe', 'C:/qt.exe'); \
$env:QT_INSTALL_DIR = 'C:/Qt'; \
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.11.2/msvc2017_64', [EnvironmentVariableTarget]::Machine); \
+ [Environment]::SetEnvironmentVariable('Qt5_DIR', 'C:/Qt/5.12.1/msvc2017_64', [EnvironmentVariableTarget]::Machine)
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
(New-Object Net.WebClient).DownloadFile('https://www.baslerweb.com/fp-1535524585/media/downloads/software/pylon_software/Basler_pylon_5.1.0.12681.exe', 'C:/Basler_pylon_5.1.0.12681.exe'); \
diff --git a/windows/base/qtifwsilent.qs b/windows/base/qtifwsilent.qs
index a9c607b..8f44afc 100644
--- a/windows/base/qtifwsilent.qs
+++ b/windows/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.5112.win64_msvc2017_64");
- widget.selectComponent("qt.qt5.5112.qtcharts");
+ widget.selectComponent("qt.qt5.5121.win64_msvc2017_64");
+ widget.selectComponent("qt.qt5.5121.qtcharts");
gui.clickButton(buttons.NextButton);
}
--
GitLab