Reverted an incorrect change

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1a229f6a7adb95415e25793635f53a3f811390c8..a94da9d5a5002c000e658d833467b75920b7f1b2 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,7 +23,7 @@ generate_export_header(dolphinvcs BASE_NAME dolphinvcs)
 
 target_link_libraries(
     dolphinvcs PUBLIC
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt6::Widgets
 )
 
 set_target_properties(dolphinvcs PROPERTIES
@@ -83,6 +83,7 @@ target_sources(dolphinprivate PRIVATE
     kitemviews/private/kitemlistsmoothscroller.cpp
     kitemviews/private/kitemlistviewanimation.cpp
     kitemviews/private/kitemlistviewlayouter.cpp
+    kitemviews/private/kitemviewsutils.cpp
     kitemviews/private/kpixmapmodifier.cpp
     settings/applyviewpropsjob.cpp
     settings/viewmodes/viewmodesettings.cpp
@@ -195,8 +196,9 @@ generate_export_header(dolphinprivate BASE_NAME dolphin)
 target_link_libraries(
     dolphinprivate PUBLIC
     dolphinvcs
-    Qt${QT_MAJOR_VERSION}::Concurrent
-    Qt${QT_MAJOR_VERSION}::Gui
+    Qt6::Concurrent
+    Qt6::DBus
+    Qt6::Gui
     KF6::I18n
     KF6::IconThemes
     KF6::KIOCore
@@ -212,8 +214,6 @@ target_link_libraries(
     KF6::Codecs
     KF6::KCMUtils
 
-    KF6::MoreTools
-
     ${FTS_LIB}
 )
 
@@ -254,7 +254,7 @@ target_link_libraries(dolphinpart
     dolphinprivate
 )
 
-install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/parts)
+install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6/parts)
 install(FILES dolphinpartactions.desktop DESTINATION "${KDE_INSTALL_DATADIR}/dolphin/")
 
 ##########################################
@@ -262,6 +262,10 @@ install(FILES dolphinpartactions.desktop DESTINATION "${KDE_INSTALL_DATADIR}/dol
 add_library(dolphinstatic STATIC)
 
 target_sources(dolphinstatic PRIVATE
+    admin/bar.cpp
+    admin/workerintegration.cpp
+    animatedheightwidget.cpp
+    disabledactionnotifier.cpp
     dolphinbookmarkhandler.cpp
     dolphindockwidget.cpp
     dolphinmainwindow.cpp
@@ -319,6 +323,9 @@ target_sources(dolphinstatic PRIVATE
     global.cpp
     dolphin.qrc
 
+    admin/bar.h
+    admin/workerintegration.h
+    animatedheightwidget.h
     dolphinbookmarkhandler.h
     dolphindockwidget.h
     dolphinmainwindow.h
@@ -382,11 +389,18 @@ if(HAVE_BALOO)
         panels/information/informationpanelcontent.cpp
         panels/information/pixmapviewer.cpp
         panels/information/phononwidget.cpp
+        settings/interface/panelsettingspage.cpp
         panels/information/informationpanel.h
         panels/information/informationpanelcontent.h
         panels/information/pixmapviewer.h
         panels/information/phononwidget.h
+        settings/interface/panelsettingspage.h
+    )
+
+    kconfig_add_kcfg_files(dolphinstatic
+        panels/information/dolphin_informationpanelsettings.kcfgc
     )
+
 endif()
 
 if(HAVE_KUSERFEEDBACK)
@@ -404,7 +418,6 @@ endif()
 
 kconfig_add_kcfg_files(dolphinstatic
     panels/folders/dolphin_folderspanelsettings.kcfgc
-    panels/information/dolphin_informationpanelsettings.kcfgc
     panels/places/dolphin_placespanelsettings.kcfgc
     settings/dolphin_compactmodesettings.kcfgc
     settings/dolphin_detailsmodesettings.kcfgc
@@ -434,21 +447,22 @@ target_link_libraries(dolphinstatic
     KF6::KCMUtils
     KF6::DBusAddons
     KF6::Notifications
-    Phonon::phonon4qt${QT_MAJOR_VERSION}
+    KF6::BookmarksWidgets
+    Phonon::phonon4qt6
 )
 
-if (HAVE_KACTIVITIES)
+if (HAVE_PLASMA_ACTIVITIES)
     target_link_libraries(
         dolphinstatic
-        KF6::Activities
+        Plasma::Activities
     )
 endif()
 
 if (HAVE_KUSERFEEDBACK)
     target_link_libraries(
         dolphinstatic
-        KUserFeedbackCoreQt6
-        KUserFeedbackWidgetsQt6
+        KF6::UserFeedbackCore
+        KF6::UserFeedbackWidgets
     )
 endif()
 
@@ -464,9 +478,18 @@ if(FLATPAK)
     target_compile_definitions(dolphin PRIVATE FLATPAK)
 endif()
 
-# Sets the icon on Windows and OSX
-file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png")
-ecm_add_app_icon(dolphin ICONS ${ICONS_SRCS})
+# Install the icons on macOS and Windows
+ecm_add_app_icon(dolphin
+    ICONS
+        icons/128-apps-org.kde.dolphin.png
+        icons/16-apps-org.kde.dolphin.png
+        icons/22-apps-org.kde.dolphin.png
+        icons/32-apps-org.kde.dolphin.png
+        icons/48-apps-org.kde.dolphin.png
+        icons/64-apps-org.kde.dolphin.png
+)
+
+install(FILES icons/org.kde.dolphin.svg DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps)
 
 target_link_libraries(dolphin
     PRIVATE
@@ -476,11 +499,7 @@ target_link_libraries(dolphin
 )
 
 if (HAVE_X11)
-    if (QT_MAJOR_VERSION STREQUAL "5")
-        target_link_libraries(dolphin PRIVATE Qt{QT_MAJOR_VERSION}::X11Extras)
-    else()
-        target_link_libraries(dolphin PRIVATE Qt::GuiPrivate)
-    endif()
+    target_link_libraries(dolphin PRIVATE Qt::GuiPrivate)
 endif()
 
 include(DbusInterfaceMacros)
@@ -591,8 +610,22 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
          DESTINATION ${KDE_INSTALL_KCFGDIR} )
 
 install( FILES settings/dolphin_detailsmodesettings.upd
+               settings/dolphin_directorysizemode.upd
+               settings/dolphin_directorysizemode.py
          DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} )
 
 if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()
+
+# movetonewfolderitemaction plugin
+
+kcoreaddons_add_plugin(movetonewfolderitemaction
+    SOURCES itemactions/movetonewfolderitemaction.cpp itemactions/movetonewfolderitemaction.h
+    INSTALL_NAMESPACE "kf6/kfileitemaction")
+
+target_link_libraries(movetonewfolderitemaction
+    KF6::I18n
+    KF6::KIOCore
+    KF6::KIOWidgets
+    KF6::KIOFileWidgets)