From 13c75a95edc81caa9ed5d4418606ce346775104c Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Thu, 29 Nov 2018 18:15:10 +0100
Subject: [PATCH] Update Qt to 5.11.2
---
windows/Dockerfile | 6 +++---
windows/qtifwsilent.qs | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/windows/Dockerfile b/windows/Dockerfile
index 52aa9e0..081a732 100644
--- a/windows/Dockerfile
+++ b/windows/Dockerfile
@@ -39,13 +39,13 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
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.1/qt-opensource-windows-x86-5.11.1.exe', 'C:/qt.exe'); \
+ (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'); \
$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.1/msvc2017_64', [EnvironmentVariableTarget]::Machine); \
- [Environment]::SetEnvironmentVariable('EGL_PLATFORM_DIR', 'C:/Qt/5.11.1/msvc2017_64/include/QtANGLE', [EnvironmentVariableTarget]::Machine)
+ [Environment]::SetEnvironmentVariable('Qt5_DIR', 'C:/Qt/5.11.2/msvc2017_64', [EnvironmentVariableTarget]::Machine); \
+ [Environment]::SetEnvironmentVariable('EGL_PLATFORM_DIR', 'C:/Qt/5.11.2/msvc2017_64/include/QtANGLE', [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/qtifwsilent.qs b/windows/qtifwsilent.qs
index 2d37dd2..a9c607b 100644
--- a/windows/qtifwsilent.qs
+++ b/windows/qtifwsilent.qs
@@ -25,8 +25,8 @@ Controller.prototype.TargetDirectoryPageCallback = function() {
Controller.prototype.ComponentSelectionPageCallback = function() {
var widget = gui.currentPageWidget();
widget.deselectAll();
- widget.selectComponent("qt.qt5.5111.win64_msvc2017_64");
- widget.selectComponent("qt.qt5.5111.qtcharts");
+ widget.selectComponent("qt.qt5.5112.win64_msvc2017_64");
+ widget.selectComponent("qt.qt5.5112.qtcharts");
gui.clickButton(buttons.NextButton);
}
--
GitLab