From 4a91c41d6ceeea2e85a8d875c79bfe9343a3111c Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Wed, 16 Dec 2020 07:53:08 +0100
Subject: [PATCH] Appveyor: Use Qt 5.15
---
appveyor.yml | 8 ++++----
src/tests/tests.cpp | 4 ++++
utils/appveyor/after_build.bat | 1 -
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 5b4e9d552..8b794bdeb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,18 +9,18 @@ skip_branch_with_pr: true
environment:
matrix:
- - QTDIR: C:\Qt\5.13\mingw73_32
+ - QTDIR: C:\Qt\5.15\mingw81_32
CMAKE_GENERATOR: MinGW Makefiles
- MINGW_PATH: C:\Qt\Tools\mingw730_32
+ MINGW_PATH: C:\Qt\Tools\mingw810_32
# https://wiki.qt.io/Qt_5.13_Tools_and_Versions
# https://www.appveyor.com/docs/windows-images-software/#tools
OPENSSL_PATH: C:\OpenSSL-v111-Win32\bin
LIBSSL: libssl-1_1.dll
LIBCRYPTO: libcrypto-1_1.dll
- - QTDIR: C:\Qt\5.13\mingw73_64
+ - QTDIR: C:\Qt\5.15\mingw81_64
CMAKE_GENERATOR: MinGW Makefiles
- MINGW_PATH: C:\Qt\Tools\mingw730_64
+ MINGW_PATH: C:\Qt\Tools\mingw810_64
OPENSSL_PATH: C:\OpenSSL-v111-Win64\bin
LIBSSL: libssl-1_1-x64.dll
LIBCRYPTO: libcrypto-1_1-x64.dll
diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
index 23ad4dc6c..8e5723bf5 100644
--- a/src/tests/tests.cpp
+++ b/src/tests/tests.cpp
@@ -189,6 +189,10 @@ bool testStderr(const QByteArray &stderrData, TestInterface::ReadStderrFlag flag
plain("ERROR: QtCritical: QWindowsPipeWriter::write failed. (The pipe is being closed.)"),
plain("ERROR: QtCritical: QWindowsPipeWriter: asynchronous write failed. (The pipe has been ended.)"),
+ // Windows Qt 5.15.2
+ plain("[qt.qpa.mime] QtWarning: Retrying to obtain clipboard."),
+ plain("[qt.qpa.fonts] QtWarning: Unable to enumerate family ' \"Font Awesome 5 Free Solid (CopyQ)\" '"),
+
// macOS
plain("QtWarning: Failed to get QCocoaScreen for NSObject(0x0)"),
plain("ERROR: Failed to open session mutex: QSystemSemaphore::handle:: ftok failed"),
diff --git a/utils/appveyor/after_build.bat b/utils/appveyor/after_build.bat
index a3d3c9f01..23b277529 100644
--- a/utils/appveyor/after_build.bat
+++ b/utils/appveyor/after_build.bat
@@ -34,7 +34,6 @@ xcopy /F "%OPENSSL_PATH%\%LIBSSL%" "%Destination%" || goto :error
%QTDIR%\bin\windeployqt --version
%QTDIR%\bin\windeployqt --help
%QTDIR%\bin\windeployqt ^
- --release ^
--no-system-d3d-compiler ^
--no-angle ^
--no-opengl-sw ^
--
GitLab