From 037518337e34fd2b597056dbcb1b1d8dedc6ad5a Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 19 Jan 2021 20:03:53 +0100
Subject: [PATCH] Test official Qt binaries for Windows.

---
 .../scripts/github-actions/build-windows.ps1  | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1
index d56237d8a..a07ac9990 100755
--- a/resources/scripts/github-actions/build-windows.ps1
+++ b/resources/scripts/github-actions/build-windows.ps1
@@ -16,28 +16,34 @@ Import-VisualStudioVars -Architecture x64
 
 $AllProtocols = [System.Net.SecurityProtocolType]'Tls11,Tls12'
 [System.Net.ServicePointManager]::SecurityProtocol = $AllProtocols
+$ProgressPreference = 'SilentlyContinue'
 
-Invoke-WebRequest -Uri "https://downloads.mariadb.org/f/mariadb-10.5.8/winx64-packages/mariadb-10.5.8-winx64.zip/from/https%3A//mirror.vpsfree.cz/mariadb/?serve" -OutFile "maria"
-
-Invoke-WebRequest -Uri "https://github.com/qt/qtbase/archive/5.15.2.zip" -OutFile "qt"
-
-ls
-
-# Get Qt.
+# Get and prepare needed dependencies.
 $qt_version = "5.15.2"
-$qt_stub = "qt-$qt_version-dynamic-msvc2019-x86_64"
-$qt_link = "https://github.com/martinrotter/qt5-minimalistic-builds/releases/download/$qt_version/$qt_stub.7z"
-$qt_output = "qt.7z"
+$qt_link = "https://github.com/qt/qtbase/archive/$qt_version.zip"
+$qt_output = "qt.zip"
+
+$maria_version = "10.5.8"
+$maria_link = "https://downloads.mariadb.org/f/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip/from/https%3A//mirror.vpsfree.cz/mariadb/?serve"
+$maria_output = "maria.zip"
+
+Invoke-WebRequest -Uri "$qt_link" -OutFile "$qt_output"
+Invoke-WebRequest -Uri "$maria_link" -OutFile "$maria_output"
 
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-Invoke-WebRequest -Uri $qt_link -OutFile $qt_output
 & ".\resources\scripts\7za\7za.exe" x $qt_output
+& ".\resources\scripts\7za\7za.exe" x $maria_output
+
+# Download Qt itself.
+$qt_path = "$old_pwd\QtBin"
+pip3 install aqtinstall
+aqt install -O "$qt_path" "$qt_version" "windows" "desktop" "win64_msvc2019_64"-m "qtwebengine" 
 
-$qt_path = (Resolve-Path $qt_stub).Path
 $qt_qmake = "$qt_path\bin\qmake.exe"
-
 $env:PATH = "$qt_path\bin\;" + $env:PATH
 
+# Build dependencies.
+....
+
 # Build application.
 mkdir "rssguard-build"
 cd "rssguard-build"