From 92bf09b58603d8e674b67df15f6bca133276214d Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Mon, 8 Apr 2024 09:22:30 +0300 Subject: [PATCH] Update Qt 6.6.3 IB-7984 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 4 ++-- README.md | 4 ++-- prepare_osx_build_environment.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1db20d076..360a9f74f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: run: | brew install ninja flatbuffers HASH=($(shasum prepare_osx_build_environment.sh)) - curl -O -L -s https://installer.id.ee/media/github/opensc_0.22.0.pkg + curl -O -L -s https://installer.id.ee/media/github/opensc_0.23.0.pkg curl -O -L -s https://installer.id.ee/media/github/${HASH}.zip sudo installer -verboseR -pkg libdigidocpp-pkg/libdigidocpp*.pkg -target / sudo installer -verboseR -pkg opensc_*.pkg -target / @@ -180,7 +180,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.6.2 + version: 6.6.3 arch: win64_msvc2019_64 - name: Setup dev env uses: ilammy/msvc-dev-cmd@v1 diff --git a/README.md b/README.md index bca6137ac..bd8785729 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ 3. Configure cmake -B build -S . \ - -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.5.3-OpenSSL + -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.6.3-OpenSSL -DOPENSSL_ROOT_DIR=~/cmake_build/OpenSSL \ -DLDAP_ROOT=~/cmake_build/OpenLDAP \ -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" @@ -93,7 +93,7 @@ 3. Configure - cmake -G"NMAKE Makefiles" -DCMAKE_PREFIX_PATH=C:\Qt\6.5.3\msvc2019_x64 -DLibDigiDocpp_ROOT="C:\Program Files (x86)\libdigidocpp" -B build -S . + cmake -G"NMAKE Makefiles" -DCMAKE_PREFIX_PATH=C:\Qt\6.6.3\msvc2019_x64 -DLibDigiDocpp_ROOT="C:\Program Files (x86)\libdigidocpp" -B build -S . 4. Build diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh index 9f755ae20..413cea839 100755 --- a/prepare_osx_build_environment.sh +++ b/prepare_osx_build_environment.sh @@ -4,7 +4,7 @@ set -e ######### Versions of libraries/frameworks to be compiled -QT_VER="6.6.2" +QT_VER="6.6.3" OPENSSL_VER="3.0.13" OPENLDAP_VER="2.6.7" REBUILD=false