From 332a48e6a1fb0509921a297d462246ce4a3a712f Mon Sep 17 00:00:00 2001 From: Felix Weilbach Date: Fri, 13 Aug 2021 11:33:50 +0200 Subject: [PATCH] Update to Qt 5.15 Signed-off-by: Felix Weilbach --- .drone.yml | 20 +++++++++---------- admin/linux/build-appimage.sh | 8 ++++---- admin/osx/CMakeLists.txt | 2 +- shell_integration/dolphin/CMakeLists.txt | 2 +- .../libcloudproviders/CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index e50ea03d9..51e9636e5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,9 +1,9 @@ kind: pipeline -name: qt-5.12 +name: qt-5.15 steps: - name: cmake - image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-1 volumes: - name: build path: /drone/build @@ -11,7 +11,7 @@ steps: - cd /drone/build - cmake -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=Debug -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DECM_ENABLE_SANITIZERS=address ../src - name: compile - image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-1 volumes: - name: build path: /drone/build @@ -19,7 +19,7 @@ steps: - cd /drone/build - make -j$(nproc) - name: test - image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-1 volumes: - name: build path: /drone/build @@ -43,11 +43,11 @@ trigger: --- kind: pipeline -name: qt-5.12-clang +name: qt-5.15-clang steps: - name: cmake - image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-1 volumes: - name: build path: /drone/build @@ -55,7 +55,7 @@ steps: - cd /drone/build - cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-10 -DCMAKE_CXX_COMPILER=clazy -DCMAKE_BUILD_TYPE=Debug -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DECM_ENABLE_SANITIZERS=address ../src - name: compile - image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-1 volumes: - name: build path: /drone/build @@ -63,7 +63,7 @@ steps: - cd /drone/build - ninja 2>1 | /drone/src/admin/linux/count_compiler_warnings.py /drone/src - name: test - image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-1 volumes: - name: build path: /drone/build @@ -73,7 +73,7 @@ steps: - chown -R test:test . - su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test - name: clang-tidy - image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-1 volumes: - name: build path: /drone/build @@ -98,7 +98,7 @@ name: AppImage steps: - name: build - image: ghcr.io/nextcloud/continuous-integration-client-appimage:client-appimage-1 + image: ghcr.io/nextcloud/continuous-integration-client-appimage:client-appimage-2 environment: CI_UPLOAD_GIT_TOKEN: from_secret: CI_UPLOAD_GIT_TOKEN diff --git a/admin/linux/build-appimage.sh b/admin/linux/build-appimage.sh index 939eac5f3..3e8781742 100755 --- a/admin/linux/build-appimage.sh +++ b/admin/linux/build-appimage.sh @@ -5,8 +5,8 @@ set -xe mkdir /app mkdir /build -#Set Qt-5.12 -export QT_BASE_DIR=/opt/qt5.12.10 +#Set Qt-5.15 +export QT_BASE_DIR=/opt/qt5.15 export QTDIR=$QT_BASE_DIR export PATH=$QT_BASE_DIR/bin:$PATH export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH @@ -75,8 +75,8 @@ cp ./usr/share/icons/hicolor/512x512/apps/Nextcloud.png . # Workaround for linux # Because distros need to get their shit together -cp -R /lib/x86_64-linux-gnu/libssl.so* ./usr/lib/ -cp -R /lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/ +cp -R /usr/lib/x86_64-linux-gnu/libssl.so* ./usr/lib/ +cp -R /usr/lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/ cp -P /usr/local/lib/libssl.so* ./usr/lib/ cp -P /usr/local/lib/libcrypto.so* ./usr/lib/ diff --git a/admin/osx/CMakeLists.txt b/admin/osx/CMakeLists.txt index ba818684f..226d7d4ee 100644 --- a/admin/osx/CMakeLists.txt +++ b/admin/osx/CMakeLists.txt @@ -9,7 +9,7 @@ else() set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0") endif() -find_package(Qt5 5.12 COMPONENTS Core REQUIRED) +find_package(Qt5 5.15 COMPONENTS Core REQUIRED) configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh) configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj) configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh) diff --git a/shell_integration/dolphin/CMakeLists.txt b/shell_integration/dolphin/CMakeLists.txt index f2fda6e1d..60a38e389 100644 --- a/shell_integration/dolphin/CMakeLists.txt +++ b/shell_integration/dolphin/CMakeLists.txt @@ -2,7 +2,7 @@ project(dolphin-owncloud) cmake_minimum_required(VERSION 2.8.12) -set(QT_MIN_VERSION "5.12.0") +set(QT_MIN_VERSION "5.15.0") set(KF5_MIN_VERSION "5.16.0") set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install the plugin in the right directory") diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt index 1dd464d25..d5391a7a4 100644 --- a/shell_integration/libcloudproviders/CMakeLists.txt +++ b/shell_integration/libcloudproviders/CMakeLists.txt @@ -41,7 +41,7 @@ macro(libcloudproviders_add_config _sources) endmacro(libcloudproviders_add_config _sources) -find_package(Qt5 5.12 COMPONENTS DBus) +find_package(Qt5 5.15 COMPONENTS DBus) IF (Qt5DBus_FOUND) STRING(TOLOWER "${APPLICATION_VENDOR}" DBUS_VENDOR) STRING(REGEX REPLACE "[^A-z0-9]" "" DBUS_VENDOR "${DBUS_VENDOR}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1a6e5daec..9cd372905 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,8 +4,8 @@ endif() include(ECMEnableSanitizers) -find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED) -find_package(Qt5 5.12 COMPONENTS WebEngineWidgets WebEngine) +find_package(Qt5 5.15 COMPONENTS Core Network Xml Concurrent REQUIRED) +find_package(Qt5 5.15 COMPONENTS WebEngineWidgets WebEngine) if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) add_compile_definitions(WITH_WEBENGINE=1)