From 8d7ed32fc26d54ab85ed57dcd65a3386a7f0505b Mon Sep 17 00:00:00 2001
From: Ryan Foster <RytoEX@gmail.com>
Date: Sat, 28 Oct 2017 00:25:13 -0400
Subject: [PATCH] Windows CI: Build with Qt 5.7.1 if Qt 5.7.0 is unavailable

---
 CI/install-setup-qt.cmd | 20 ++++++++++++++++++++
 appveyor.yml            |  7 ++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 CI/install-setup-qt.cmd

diff --git a/CI/install-setup-qt.cmd b/CI/install-setup-qt.cmd
new file mode 100644
index 00000000..eee49738
--- /dev/null
+++ b/CI/install-setup-qt.cmd
@@ -0,0 +1,20 @@
+@echo off
+
+REM Set default values to use AppVeyor's built-in Qt.
+set QTDIR32=C:\Qt\5.7\msvc2013
+set QTDIR64=C:\Qt\5.7\msvc2013_64
+set QTCompileVersion=5.7.1
+
+REM If the AppVeyor cache couldn't recover qt570.7z,
+REM try to fetch Qt 5.7.0 from slepin.fr.
+if not exist qt570.7z (
+  curl -kLO https://www.slepin.fr/obs-plugins/deps/qt570.7z -f --retry 5 -C -
+)
+
+REM If qt570.7z exists now, use that instead of AppVeyor's built-in Qt.
+if exist qt570.7z (
+  7z x qt570.7z -o"Qt5.7.0"
+  set QTDIR32=%CD%\Qt5.7.0\msvc2013
+  set QTDIR64=%CD%\Qt5.7.0\msvc2013_64
+  set QTCompileVersion=5.7.0
+)
diff --git a/appveyor.yml b/appveyor.yml
index 4dda34d1..d1dd0a81 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,12 +6,9 @@ install:
   - cd C:\projects\
   - if not exist dependencies2013.zip curl -kLO https://obsproject.com/downloads/dependencies2013.zip -f --retry 5 -C -
   - 7z x dependencies2013.zip -odependencies2013
-  - if not exist qt570.zip curl -kLO https://www.slepin.fr/obs-websocket/ci/qt570.zip -f --retry 5 -C -
-  - 7z x qt570.zip -o"Qt5.7.0"
   - set DepsPath32=%CD%\dependencies2013\win32
   - set DepsPath64=%CD%\dependencies2013\win64
-  - set QTDIR32=%CD%\Qt5.7.0\msvc2013
-  - set QTDIR64=%CD%\Qt5.7.0\msvc2013_64
+  - call C:\projects\obs-websocket\CI\install-setup-qt.cmd
   - set build_config=Release
   - call C:\projects\obs-websocket\CI\install-build-obs.cmd
   - cd C:\projects\obs-websocket\
@@ -36,6 +33,6 @@ test: off
 
 cache:
   - C:\projects\dependencies2013.zip
-  - C:\projects\qt570.zip
+  - C:\projects\qt570.7z
   - C:\projects\obs-studio-last-tag-built.txt
   - C:\projects\obs-studio\