From d27e28410d33f2943349b4175a33073052110c9a Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 22 Sep 2023 17:27:51 +0300 Subject: [PATCH] Because we install qbs with brew we must use Qt from brew too. --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 241b43859..4503ad878 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -693,7 +693,7 @@ for: python3 ./scripts/treestate.py scan /usr/local usrlocal.json brew update - brew install coreutils ccache git openssl@1.1 pkg-config qbs cmake ninja poppler + brew install coreutils ccache git openssl@1.1 pkg-config qbs qt6 cmake ninja poppler # The build environment is now ready for use. We can complete # the rest of the process of creating the Homebrew archive @@ -749,7 +749,7 @@ for: - conan install . --build=missing -pr valentina - qbs setup-toolchains --detect - qbs config --list profiles - - qbs setup-qt ${QTDIR}/bin/qmake qt6 + - qbs setup-qt $(brew --prefix qt6)/bin/qmake qt6 - qbs config defaultProfile qt6 - qbs config profiles.qt6.baseProfile clang - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir