From 21faa67b5857e2999d29656698201593107b4085 Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Thu, 30 Jun 2022 23:17:02 +0200
Subject: [PATCH] Configure AppVeyor to run Qt 6.x tests

---
 .appveyor.yml | 43 +++++++++++++++++++++++++------------------
 .travis.yml   |  4 ++--
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index da83ffc..9b40f04 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,27 +1,34 @@
-image: Visual Studio 2015
-
-init:
-  - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio "%VSVER%".0\VC\vcvarsall.bat" %ARCH%
-  - cmd: qmake --version
-
+# https://www.appveyor.com/docs/build-configuration/
+# https://www.appveyor.com/docs/lang/cpp/#visual-studio
 # https://www.appveyor.com/docs/windows-images-software/#qt
+
 environment:
   PATH: '%PATH%;%QTDIR%\bin'
   matrix:
-    - QTDIR: C:\Qt\5.6\msvc2013
-      VSVER: 12
-      ARCH: x86
-    - QTDIR: C:\Qt\5.9\msvc2013_64
-      VSVER: 12
-      ARCH: x64
-    - QTDIR: C:\Qt\latest\msvc2015_64
-      VSVER: 14
-      ARCH: x64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      QTDIR: C:\Qt\5.6\msvc2013
+      SETUP_CMD: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat
+      SETUP_ARG: x86
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      QTDIR: C:\Qt\5.15\msvc2019_64
+      SETUP_CMD: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      QTDIR: C:\Qt\6.2\msvc2019_64
+      SETUP_CMD: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat
+
+before_build:
+  - call "%SETUP_CMD%" %SETUP_ARG%
+  - cmake --version
+  - qmake --version
 
 build_script:
-  - cmd: cmake -G "NMake Makefiles"
-  - cmd: cmake --build .
+  - cmake -G "NMake Makefiles"
+  - cmake --build .
 
 test_script:
-  - cmd: cmake --build . --target test
+  - cmake --build . --target test
 
+matrix:
+  fast_finish: true
diff --git a/.travis.yml b/.travis.yml
index 4443688..e6b92a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: cpp
 compiler: gcc
 
 before_install:
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-  - sudo add-apt-repository -y ppa:beineri/opt-qt563-trusty
+  - sudo add-apt-repository -y ppa:beineri/opt-qt563-xenial
   - sudo apt-get update -qq
 
 install: