From d592d343b9104b90371efd3203a5ff378bea064e Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Wed, 31 May 2023 15:35:14 +0300 Subject: [PATCH] Upgrade Qt 6.5.1 (#1195) IB-7747 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 6 +++--- README.md | 4 ++-- client/CMakeLists.txt | 14 +++++++++++--- prepare_osx_build_environment.sh | 4 ++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0fb6f4277..b6108f5d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -173,16 +173,16 @@ jobs: vcpkgGitCommitId: 9b9c2758ece1d8ac0de90589730bb5ccf45c0874 vcpkgTriplet: x64-windows - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: - version: 6.5.0 + version: 6.5.1 arch: win64_msvc2019_64 modules: qt5compat - name: Setup dev env uses: ilammy/msvc-dev-cmd@v1 with: arch: x64 - sdk: 10.0.17763.0 + sdk: 10.0.19041.0 - name: Build run: | md build/client diff --git a/README.md b/README.md index 547e3bf7b..d89e81bf7 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ 3. Configure cmake -B build -S . \ - -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.4.1-OpenSSL/lib/cmake/Qt6 + -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.5.1-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.4.1\msvc2019\lib\cmake\Qt6" -B build -S . + cmake -G"NMAKE Makefiles" -DCMAKE_PREFIX_PATH="C:\Qt\6.5.1\msvc2019\lib\cmake\Qt6" -B build -S . 4. Build diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index c9efde45c..404c6992e 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -225,7 +225,7 @@ elseif(WIN32) endif() set(MSI_FILE "Digidoc4_Client-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}") list(APPEND CANDLE_CMD "$ENV{WIX}bin\\candle.exe" -nologo -arch ${PLATFORM} -dMSI_VERSION=${VERSION} -dPlatform=${PLATFORM} - -dlibs_path="${LIBS_PATH}" -dclient_path=$ -dico_path=${CMAKE_CURRENT_SOURCE_DIR}/images/digidoc.ico + -dlibs_path=${LIBS_PATH} -dclient_path=$ -dico_path=${CMAKE_CURRENT_SOURCE_DIR}/images/digidoc.ico -dqtconf=${CMAKE_SOURCE_DIR}/qt.conf -dschemasLocation=${LIBS_PATH}/schema SchemasFragment.wxs -dqt_suffix=$<$:d> ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.wxs ${CMAKE_SOURCE_DIR}/cmake/modules/WelcomeDlg2.wxs ${CMAKE_SOURCE_DIR}/cmake/modules/WixUI_Minimal2.wxs) @@ -310,14 +310,22 @@ else() DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${RES}x${RES}/mimetypes/ RENAME application-x-cdoc.png ) - foreach(TGT application-vnd.etsi.asic-s+zip.png application-x-ddoc.png application-vnd.lt.archyvai.adoc-2008.png) + foreach(TGT + application-vnd.etsi.asic-s+zip.png + application-x-ddoc.png + application-vnd.lt.archyvai.adoc-2008.png) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink application-vnd.etsi.asic-e+zip.png \ \$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${RES}x${RES}/mimetypes/${TGT})") endforeach() # Workaround Ubuntu 21.10 Yaru icon theme issues install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory \ \$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_DATADIR}/icons/Yaru/${RES}x${RES}/mimetypes/)") - foreach(TGT application-vnd.etsi.asic-e+zip.png application-vnd.etsi.asic-s+zip.png application-x-ddoc.png application-vnd.lt.archyvai.adoc-2008.png application-x-cdoc.png) + foreach(TGT + application-vnd.etsi.asic-e+zip.png + application-vnd.etsi.asic-s+zip.png + application-x-ddoc.png + application-vnd.lt.archyvai.adoc-2008.png + application-x-cdoc.png) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \ ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${RES}x${RES}/mimetypes/${TGT} \ \$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_DATADIR}/icons/Yaru/${RES}x${RES}/mimetypes/${TGT})") diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh index 55ffaad92..c8b823611 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.5.0" +QT_VER="6.5.1" OPENSSL_VER="3.0.8" OPENLDAP_VER="2.6.4" REBUILD=false @@ -108,7 +108,7 @@ if [[ "$REBUILD" = true || ! -d ${QT_PATH} ]] ; then tar xf ${PACKAGE}.tar.xz pushd ${PACKAGE} if [[ "${PACKAGE}" == *"qtbase"* ]] ; then - ./configure -prefix ${QT_PATH} -opensource -nomake tests -nomake examples -no-securetransport -openssl -openssl-linked -confirm-license -appstore-compliant -- -DOPENSSL_ROOT_DIR=${OPENSSL_PATH} -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" + ./configure -prefix ${QT_PATH} -opensource -nomake tests -nomake examples -no-securetransport -openssl-linked -confirm-license -appstore-compliant -- -DOPENSSL_ROOT_DIR=${OPENSSL_PATH} -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" else ${QT_PATH}/bin/qt-configure-module . fi