From 2129d121436cf009d1ad737778b6c7fabb9b8d4b Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Wed, 25 Jul 2018 11:59:58 -0400 Subject: [PATCH 1/3] frontend-tools: Add QAction explicitly for Qt 5.11 compatibility --- UI/frontend-plugins/frontend-tools/captions.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/UI/frontend-plugins/frontend-tools/captions.cpp b/UI/frontend-plugins/frontend-tools/captions.cpp index 43ebf94e2..5c68d8781 100644 --- a/UI/frontend-plugins/frontend-tools/captions.cpp +++ b/UI/frontend-plugins/frontend-tools/captions.cpp @@ -1,4 +1,5 @@ #include +#include #include #include From 6820a6b9ab7f3f6cc0b67e4a75f2455366215158 Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Wed, 25 Jul 2018 11:59:59 -0400 Subject: [PATCH 2/3] CI: Use Qt 5.11.1 on AppVeyor for Windows --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 68d512631..b2f34c9a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,8 +11,8 @@ install: - set DepsPath32=%CD%\dependencies2017\win32 - set DepsPath64=%CD%\dependencies2017\win64 - set VLCPath=%CD%\vlc - - set QTDIR32=C:\Qt\5.10.1\msvc2015 - - set QTDIR64=C:\Qt\5.10.1\msvc2017_64 + - set QTDIR32=C:\Qt\5.11.1\msvc2015 + - set QTDIR64=C:\Qt\5.11.1\msvc2017_64 - set build_config=RelWithDebInfo - mkdir build build32 build64 - cd ./build32 From 729abd3825c8fc64e7a74367118e1c78e218d8cf Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Wed, 25 Jul 2018 12:00:21 -0400 Subject: [PATCH 3/3] CI: Use Qt 5.11.1 on Travis for macOS --- CI/install-dependencies-osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index 712680b86..d670a7eb2 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -24,7 +24,7 @@ sudo installer -pkg ./Packages.pkg -target / brew update #Base OBS Deps and ccache -brew install qt5 jack speexdsp ccache swig +brew install qt@5.11 jack speexdsp ccache swig export PATH=/usr/local/opt/ccache/libexec:$PATH ccache -s || echo "CCache is not available."