From ee1d6146a61d39a8b8c3fa1115000ed8ecaefe70 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 8 Apr 2021 14:13:46 +0200 Subject: [PATCH] GitHub CI: build with Qt 6 Following to previous commit, we can build with Qt 6 (even thought that a workaround is neeeded). qt package (version 6) is installed anyways as a dependency of opencv --- .github/scripts/macOS/prepare.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 85f369d00..8fe0d0090 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -34,14 +34,11 @@ brew install libsoxr speexdsp brew install ffmpeg portaudio sdl2 sdl2_mixer sdl2_ttf brew install imagemagick libcaca libnatpmp jack opencv wolfssl brew install ossp-uuid # for cineform -brew install qt@5 +brew install qt brew install glm sudo curl -L https://raw.githubusercontent.com/miniupnp/libnatpmp/master/\ natpmp_declspec.h -o /usr/local/include/natpmp_declspec.h -rm -f /usr/local/opt/qt -cp -af /usr/local/opt/qt@5 /usr/local/opt/qt - .github/scripts/macOS/install_dylibbundler_v2.sh mkdir $TEMP_INST