kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-28 20:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename KF5 to KF6

Browse source
This commit is contained in:
Dāvis Mosāns 2023-02-06 21:42:39 +00:00
parent ba60b6ada3
commit 6600dc9bdc
6 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
CMakeLists.txt
View file

@ -8,10 +8,10 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) project(Dolphin VERSION ${RELEASE_SERVICE_VERSION})
set(QT_MIN_VERSION "5.15.2") 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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
include(KDEInstallDirs) 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 KCMUtils
NewStuff NewStuff
CoreAddons CoreAddons
@ -89,11 +89,11 @@ if(KUserFeedback_FOUND)
set(HAVE_KUSERFEEDBACK TRUE) set(HAVE_KUSERFEEDBACK TRUE)
endif() endif()
find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS find_package(KF6 ${KF6_MIN_VERSION} OPTIONAL_COMPONENTS
Activities Activities
DocTools DocTools
) )
set_package_properties(KF5Activities PROPERTIES DESCRIPTION "KActivities libraries" set_package_properties(KF6Activities PROPERTIES DESCRIPTION "KActivities libraries"
URL "https://www.kde.org" URL "https://www.kde.org"
TYPE OPTIONAL TYPE OPTIONAL
PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop" 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) set(HAVE_PACKAGEKIT TRUE)
endif() endif()
find_package(KF5Baloo ${KF5_MIN_VERSION}) find_package(KF6Baloo ${KF6_MIN_VERSION})
set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "Baloo Core libraries" set_package_properties(KF6Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"
URL "https://www.kde.org" URL "https://www.kde.org"
TYPE OPTIONAL TYPE OPTIONAL
PURPOSE "For adding desktop-wide search and tagging support to dolphin" PURPOSE "For adding desktop-wide search and tagging support to dolphin"
) )
find_package(KF5BalooWidgets 19.07.70) find_package(KF6BalooWidgets 19.07.70)
set_package_properties(KF5BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets" set_package_properties(KF6BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets"
URL "https://www.kde.org" URL "https://www.kde.org"
TYPE OPTIONAL TYPE OPTIONAL
) )
find_package(KF5FileMetaData ${KF5_MIN_VERSION}) find_package(KF6FileMetaData ${KF6_MIN_VERSION})
set_package_properties(KF5FileMetaData PROPERTIES set_package_properties(KF6FileMetaData PROPERTIES
URL "https://projects.kde.org/kfilemetadata" URL "https://projects.kde.org/kfilemetadata"
TYPE OPTIONAL TYPE OPTIONAL
PURPOSE "For accessing file metadata labels" PURPOSE "For accessing file metadata labels"
) )
if (KF5Activities_FOUND) if (KF6Activities_FOUND)
set(HAVE_KACTIVITIES TRUE) set(HAVE_KACTIVITIES TRUE)
endif() 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") message(STATUS "Baloo packages are found")
set(HAVE_BALOO TRUE) set(HAVE_BALOO TRUE)
else() 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) kdoctools_install(po)
endif() endif()

2
DolphinVcsConfig.cmake.in
View file

@ -3,6 +3,6 @@
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
find_dependency(Qt@QT_MAJOR_VERSION@Widgets) 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")

2
doc/CMakeLists.txt
View file

@ -1,4 +1,4 @@
if (KF5DocTools_FOUND) if (KF6DocTools_FOUND)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR dolphin) kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR dolphin)
endif() endif()

46
src/CMakeLists.txt
View file

@ -195,28 +195,28 @@ target_link_libraries(
dolphinvcs dolphinvcs
Qt${QT_MAJOR_VERSION}::Concurrent Qt${QT_MAJOR_VERSION}::Concurrent
Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Gui
KF5::I18n KF6::I18n
KF5::IconThemes KF6::IconThemes
KF5::KIOCore KF6::KIOCore
KF5::KIOWidgets KF6::KIOWidgets
KF5::KIOFileWidgets KF6::KIOFileWidgets
KF5::Completion KF6::Completion
KF5::TextWidgets KF6::TextWidgets
KF5::ConfigCore KF6::ConfigCore
KF5::NewStuff KF6::NewStuff
KF5::NewStuffWidgets # KNSWidgets::Button KF6::NewStuffWidgets # KNSWidgets::Button
KF5::Parts KF6::Parts
KF5::WindowSystem KF6::WindowSystem
KF5::WidgetsAddons KF6::WidgetsAddons
KF5::Codecs KF6::Codecs
) )
if(HAVE_BALOO) if(HAVE_BALOO)
target_link_libraries( target_link_libraries(
dolphinprivate PUBLIC dolphinprivate PUBLIC
KF5::FileMetaData KF6::FileMetaData
KF5::Baloo KF6::Baloo
KF5::BalooWidgets KF6::BalooWidgets
) )
endif() endif()
@ -427,17 +427,17 @@ target_sources(dolphinstatic PRIVATE
target_include_directories(dolphinstatic SYSTEM PRIVATE ${PHONON_INCLUDES}) target_include_directories(dolphinstatic SYSTEM PRIVATE ${PHONON_INCLUDES})
target_link_libraries(dolphinstatic target_link_libraries(dolphinstatic
dolphinprivate dolphinprivate
KF5::CoreAddons KF6::CoreAddons
KF5::KCMUtils KF6::KCMUtils
KF5::DBusAddons KF6::DBusAddons
KF5::Notifications KF6::Notifications
Phonon::phonon4qt${QT_MAJOR_VERSION} Phonon::phonon4qt${QT_MAJOR_VERSION}
) )
if (HAVE_KACTIVITIES) if (HAVE_KACTIVITIES)
target_link_libraries( target_link_libraries(
dolphinstatic dolphinstatic
KF5::Activities KF6::Activities
) )
endif() endif()
@ -469,7 +469,7 @@ target_link_libraries(dolphin
PRIVATE PRIVATE
dolphinprivate dolphinprivate
dolphinstatic dolphinstatic
KF5::Crash KF6::Crash
) )
if (HAVE_X11) if (HAVE_X11)

4
src/settings/contextmenu/servicemenuinstaller/CMakeLists.txt
View file

@ -5,8 +5,8 @@ add_executable(servicemenuinstaller servicemenuinstaller.cpp)
target_link_libraries(servicemenuinstaller PRIVATE target_link_libraries(servicemenuinstaller PRIVATE
Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Gui
KF5::I18n KF6::I18n
KF5::CoreAddons KF6::CoreAddons
) )
if(HAVE_PACKAGEKIT) if(HAVE_PACKAGEKIT)

4
src/tests/CMakeLists.txt
View file

@ -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) ecm_add_test(kitemlistkeyboardsearchmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test)
# DolphinSearchBox # DolphinSearchBox
if (KF5Baloo_FOUND) if (KF6Baloo_FOUND)
ecm_add_test(dolphinsearchboxtest.cpp ecm_add_test(dolphinsearchboxtest.cpp
TEST_NAME dolphinsearchboxtest TEST_NAME dolphinsearchboxtest
LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test) LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)
endif() endif()
# DolphinQuery # DolphinQuery
if (KF5Baloo_FOUND) if (KF6Baloo_FOUND)
ecm_add_test(dolphinquerytest.cpp ecm_add_test(dolphinquerytest.cpp
TEST_NAME dolphinquerytest TEST_NAME dolphinquerytest
LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test) LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)