Rename KF5 to KF6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88ccc058c5e6fd03b9f9f0ce7e9ea512bc6f7ea5..3828af00e833924b2705d2ea23973fcca1b0566f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,10 +8,10 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
 project(Dolphin VERSION ${RELEASE_SERVICE_VERSION})
 
 set(QT_MIN_VERSION "5.15.2")
 project(Dolphin VERSION ${RELEASE_SERVICE_VERSION})
 
 set(QT_MIN_VERSION "5.15.2")

-set(KF5_MIN_VERSION "5.101.0")
+set(KF6_MIN_VERSION "5.102.0")

 
 # ECM setup
 
 # ECM setup

-find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
+find_package(ECM ${KF6_MIN_VERSION} CONFIG REQUIRED)

 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 include(KDEInstallDirs)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 include(KDEInstallDirs)


@@ -58,7 +58,7 @@ if (UNIX AND NOT APPLE)
     endif()
 endif()
 
     endif()
 endif()
 

-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS

     KCMUtils
     NewStuff
     CoreAddons
     KCMUtils
     NewStuff
     CoreAddons


@@ -89,11 +89,11 @@ if(KUserFeedback_FOUND)
     set(HAVE_KUSERFEEDBACK TRUE)
 endif()
 
     set(HAVE_KUSERFEEDBACK TRUE)
 endif()
 

-find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
+find_package(KF6 ${KF6_MIN_VERSION} OPTIONAL_COMPONENTS

     Activities
     DocTools
 )
     Activities
     DocTools
 )

-set_package_properties(KF5Activities PROPERTIES DESCRIPTION "KActivities libraries"
+set_package_properties(KF6Activities PROPERTIES DESCRIPTION "KActivities libraries"

                        URL "https://www.kde.org"
                        TYPE OPTIONAL
                        PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop"
                        URL "https://www.kde.org"
                        TYPE OPTIONAL
                        PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop"


@@ -111,31 +111,31 @@ if(PackageKitQt${QT_MAJOR_VERSION}_FOUND)
     set(HAVE_PACKAGEKIT TRUE)
 endif()
 
     set(HAVE_PACKAGEKIT TRUE)
 endif()
 

-find_package(KF5Baloo ${KF5_MIN_VERSION})
-set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"
+find_package(KF6Baloo ${KF6_MIN_VERSION})
+set_package_properties(KF6Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"

                        URL "https://www.kde.org"
                        TYPE OPTIONAL
                        PURPOSE "For adding desktop-wide search and tagging support to dolphin"
                       )
 
                        URL "https://www.kde.org"
                        TYPE OPTIONAL
                        PURPOSE "For adding desktop-wide search and tagging support to dolphin"
                       )
 

-find_package(KF5BalooWidgets 19.07.70)
-set_package_properties(KF5BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets"
+find_package(KF6BalooWidgets 19.07.70)
+set_package_properties(KF6BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets"

                        URL "https://www.kde.org"
                        TYPE OPTIONAL
                       )
 
                        URL "https://www.kde.org"
                        TYPE OPTIONAL
                       )
 

-find_package(KF5FileMetaData ${KF5_MIN_VERSION})
-set_package_properties(KF5FileMetaData PROPERTIES
+find_package(KF6FileMetaData ${KF6_MIN_VERSION})
+set_package_properties(KF6FileMetaData PROPERTIES

                        URL "https://projects.kde.org/kfilemetadata"
                        TYPE OPTIONAL
                        PURPOSE "For accessing file metadata labels"
                       )
 
                        URL "https://projects.kde.org/kfilemetadata"
                        TYPE OPTIONAL
                        PURPOSE "For accessing file metadata labels"
                       )
 

-if (KF5Activities_FOUND)
+if (KF6Activities_FOUND)

     set(HAVE_KACTIVITIES TRUE)
 endif()
 
     set(HAVE_KACTIVITIES TRUE)
 endif()
 

-if (KF5Baloo_FOUND AND KF5BalooWidgets_FOUND AND KF5FileMetaData_FOUND)
+if (KF6Baloo_FOUND AND KF6BalooWidgets_FOUND AND KF6FileMetaData_FOUND)

     message(STATUS "Baloo packages are found")
     set(HAVE_BALOO TRUE)
 else()
     message(STATUS "Baloo packages are found")
     set(HAVE_BALOO TRUE)
 else()


@@ -211,7 +211,7 @@ ecm_qt_install_logging_categories(
         )
 
 ki18n_install(po)
         )
 
 ki18n_install(po)

-if(KF5DocTools_FOUND)
+if(KF6DocTools_FOUND)

     kdoctools_install(po)
 endif()
 
     kdoctools_install(po)
 endif()
 

diff --git a/DolphinVcsConfig.cmake.in b/DolphinVcsConfig.cmake.in
index b6e3d42f60954025b58d83c214622b98bff1ffbe..c73d093ed4a4e58be97e25015382ebe2bf9ed779 100644 (file)
--- a/DolphinVcsConfig.cmake.in
+++ b/DolphinVcsConfig.cmake.in
@@ -3,6 +3,6 @@
 include(CMakeFindDependencyMacro)
 
 find_dependency(Qt@QT_MAJOR_VERSION@Widgets)
 include(CMakeFindDependencyMacro)
 
 find_dependency(Qt@QT_MAJOR_VERSION@Widgets)

-find_dependency(KF5KIO)
+find_dependency(KF6KIO)

 
 include("${CMAKE_CURRENT_LIST_DIR}/DolphinVcsTargets.cmake")
 
 include("${CMAKE_CURRENT_LIST_DIR}/DolphinVcsTargets.cmake")

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 934f7a9ff4a9e74c38041977e3c6ca52243d099f..7527bbfa9a7ea8d15ab4f0a8e721a033fa8d93ef 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
 
 

-if (KF5DocTools_FOUND)
+if (KF6DocTools_FOUND)

     kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR dolphin)
 endif()
     kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR dolphin)
 endif()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 97bc770d7b10f42f4fc2c213a8ab09222724747e..d9e40dc5f5661f6b43623cf5c50a137bace66f2e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -195,28 +195,28 @@ target_link_libraries(
     dolphinvcs
     Qt${QT_MAJOR_VERSION}::Concurrent
     Qt${QT_MAJOR_VERSION}::Gui
     dolphinvcs
     Qt${QT_MAJOR_VERSION}::Concurrent
     Qt${QT_MAJOR_VERSION}::Gui

-    KF5::I18n
-    KF5::IconThemes
-    KF5::KIOCore
-    KF5::KIOWidgets
-    KF5::KIOFileWidgets
-    KF5::Completion
-    KF5::TextWidgets
-    KF5::ConfigCore
-    KF5::NewStuff
-    KF5::NewStuffWidgets    # KNSWidgets::Button
-    KF5::Parts
-    KF5::WindowSystem
-    KF5::WidgetsAddons
-    KF5::Codecs
+    KF6::I18n
+    KF6::IconThemes
+    KF6::KIOCore
+    KF6::KIOWidgets
+    KF6::KIOFileWidgets
+    KF6::Completion
+    KF6::TextWidgets
+    KF6::ConfigCore
+    KF6::NewStuff
+    KF6::NewStuffWidgets    # KNSWidgets::Button
+    KF6::Parts
+    KF6::WindowSystem
+    KF6::WidgetsAddons
+    KF6::Codecs

 )
 
 if(HAVE_BALOO)
     target_link_libraries(
         dolphinprivate PUBLIC
 )
 
 if(HAVE_BALOO)
     target_link_libraries(
         dolphinprivate PUBLIC

-        KF5::FileMetaData
-        KF5::Baloo
-        KF5::BalooWidgets
+        KF6::FileMetaData
+        KF6::Baloo
+        KF6::BalooWidgets

     )
 endif()
 
     )
 endif()
 


@@ -427,17 +427,17 @@ target_sources(dolphinstatic PRIVATE
 target_include_directories(dolphinstatic SYSTEM PRIVATE ${PHONON_INCLUDES})
 target_link_libraries(dolphinstatic
     dolphinprivate
 target_include_directories(dolphinstatic SYSTEM PRIVATE ${PHONON_INCLUDES})
 target_link_libraries(dolphinstatic
     dolphinprivate

-    KF5::CoreAddons
-    KF5::KCMUtils
-    KF5::DBusAddons
-    KF5::Notifications
+    KF6::CoreAddons
+    KF6::KCMUtils
+    KF6::DBusAddons
+    KF6::Notifications

     Phonon::phonon4qt${QT_MAJOR_VERSION}
 )
 
 if (HAVE_KACTIVITIES)
     target_link_libraries(
         dolphinstatic
     Phonon::phonon4qt${QT_MAJOR_VERSION}
 )
 
 if (HAVE_KACTIVITIES)
     target_link_libraries(
         dolphinstatic

-        KF5::Activities
+        KF6::Activities

     )
 endif()
 
     )
 endif()
 


@@ -469,7 +469,7 @@ target_link_libraries(dolphin
     PRIVATE
     dolphinprivate
     dolphinstatic
     PRIVATE
     dolphinprivate
     dolphinstatic

-    KF5::Crash
+    KF6::Crash

 )
 
 if (HAVE_X11)
 )
 
 if (HAVE_X11)

diff --git a/src/settings/contextmenu/servicemenuinstaller/CMakeLists.txt b/src/settings/contextmenu/servicemenuinstaller/CMakeLists.txt
index 74576ad207868b4f6573012665497754205e64a0..603e5c2e51970e9e456786e9c3feb3dddaf2fedf 100644 (file)
--- a/src/settings/contextmenu/servicemenuinstaller/CMakeLists.txt
+++ b/src/settings/contextmenu/servicemenuinstaller/CMakeLists.txt
@@ -5,8 +5,8 @@ add_executable(servicemenuinstaller servicemenuinstaller.cpp)
 target_link_libraries(servicemenuinstaller PRIVATE
     Qt${QT_MAJOR_VERSION}::Core
     Qt${QT_MAJOR_VERSION}::Gui
 target_link_libraries(servicemenuinstaller PRIVATE
     Qt${QT_MAJOR_VERSION}::Core
     Qt${QT_MAJOR_VERSION}::Gui

-    KF5::I18n
-    KF5::CoreAddons
+    KF6::I18n
+    KF6::CoreAddons

 )
 
 if(HAVE_PACKAGEKIT)
 )
 
 if(HAVE_PACKAGEKIT)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index d4a7457cb55d5c4fcb8492197b189a01f9b40715..2495a3a595bc7404827f82cdfb63fb30e50b1cc7 100644 (file)
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -38,14 +38,14 @@ target_link_libraries(kfileitemmodelbenchmark dolphinprivate Qt${QT_MAJOR_VERSIO
 ecm_add_test(kitemlistkeyboardsearchmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test)
 
 # DolphinSearchBox
 ecm_add_test(kitemlistkeyboardsearchmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test)
 
 # DolphinSearchBox

-if (KF5Baloo_FOUND)
+if (KF6Baloo_FOUND)

     ecm_add_test(dolphinsearchboxtest.cpp
     TEST_NAME dolphinsearchboxtest
     LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)
 endif()
 
 # DolphinQuery
     ecm_add_test(dolphinsearchboxtest.cpp
     TEST_NAME dolphinsearchboxtest
     LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)
 endif()
 
 # DolphinQuery

-if (KF5Baloo_FOUND)
+if (KF6Baloo_FOUND)

     ecm_add_test(dolphinquerytest.cpp
     TEST_NAME dolphinquerytest
     LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)
     ecm_add_test(dolphinquerytest.cpp
     TEST_NAME dolphinquerytest
     LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)