From 9a33a72fe162a75dec5a08f722fc261105077d76 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Fri, 10 May 2024 13:14:37 -0400 Subject: [PATCH] Update Qt/KF min requirements --- CMakeLists.txt | 12 ++++++------ src/tests/demo_konsolepart/CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0a5ecd6a..81decb02f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,13 +14,13 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE cmake_minimum_required(VERSION 3.16 FATAL_ERROR) set(QT_MIN_VERSION "6.5.0") -set(KF5_DEP_VERSION "5.240.0") +set(KF6_DEP_VERSION "6.0.0") set(QT_MAJOR_VERSION "6") # Release script will create bugzilla versions project(konsole VERSION ${RELEASE_SERVICE_VERSION}) -find_package(ECM ${KF5_DEP_VERSION} REQUIRED NO_MODULE) +find_package(ECM ${KF6_DEP_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) include(KDEInstallDirs) @@ -52,7 +52,7 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED Core5Compat ) -find_package(KF6 ${KF5_DEP_VERSION} REQUIRED +find_package(KF6 ${KF6_DEP_VERSION} REQUIRED Bookmarks Config ConfigWidgets @@ -75,18 +75,18 @@ find_package(KF6 ${KF5_DEP_VERSION} REQUIRED ) if (NOT WIN32) - find_package(KF6 ${KF5_DEP_VERSION} REQUIRED + find_package(KF6 ${KF6_DEP_VERSION} REQUIRED Pty ) endif() if (NOT WIN32 AND NOT APPLE) - find_package(KF6 ${KF5_DEP_VERSION} REQUIRED + find_package(KF6 ${KF6_DEP_VERSION} REQUIRED GlobalAccel ) endif() -find_package(KF6DocTools ${KF5_DEP_VERSION}) +find_package(KF6DocTools ${KF6_DEP_VERSION}) set_package_properties(KF6DocTools PROPERTIES DESCRIPTION "Tools to generate documentation" TYPE OPTIONAL diff --git a/src/tests/demo_konsolepart/CMakeLists.txt b/src/tests/demo_konsolepart/CMakeLists.txt index ce1791a6d..71d0e484e 100644 --- a/src/tests/demo_konsolepart/CMakeLists.txt +++ b/src/tests/demo_konsolepart/CMakeLists.txt @@ -12,10 +12,10 @@ include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMInstallIcons) include(FeatureSummary) -set(QT_MIN_VERSION "5.4.0") +set(QT_MIN_VERSION "6.5.0") find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets) -set(REQUIRED_KF_VERSION "5.18.0") +set(REQUIRED_KF_VERSION "6.0.0") find_package(KF6 ${REQUIRED_KF_VERSION} REQUIRED COMPONENTS CoreAddons I18n