[KStandardItemListWidget] Round to icon size before applying scaling

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1b63358dcf024d08150a2a617514c65aaa984eb..eacb792fc9cf05956fd7c4d7f5937569432917f6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,12 +6,9 @@ configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin
 
 add_definitions(
     -DTRANSLATION_DOMAIN=\"dolphin\"
-    -DQT_USE_FAST_CONCATENATION
-    -DQT_USE_FAST_OPERATOR_PLUS
 )
 remove_definitions(
     -DQT_NO_CAST_FROM_BYTEARRAY
-    -DQT_NO_URL_CAST_FROM_STRING
     -DQT_NO_SIGNALS_SLOTS_KEYWORDS
     -DQT_NO_CAST_FROM_ASCII
     -DQT_NO_CAST_TO_ASCII
@@ -89,7 +86,6 @@ set(dolphinprivate_LIB_SRCS
     kitemviews/private/kitemlistviewanimation.cpp
     kitemviews/private/kitemlistviewlayouter.cpp
     kitemviews/private/kpixmapmodifier.cpp
-    settings/additionalinfodialog.cpp
     settings/applyviewpropsjob.cpp
     settings/viewmodes/viewmodesettings.cpp
     settings/viewpropertiesdialog.cpp
@@ -137,6 +133,7 @@ generate_export_header(dolphinprivate BASE_NAME dolphin)
 target_link_libraries(
     dolphinprivate PUBLIC
     dolphinvcs
+    Qt5::Concurrent
     Qt5::Gui
     KF5::Crash
     KF5::I18n
@@ -201,11 +198,12 @@ set(dolphinstatic_SRCS
     dolphinviewcontainer.cpp
     dolphincontextmenu.cpp
     dolphintabbar.cpp
+    dolphinplacesmodelsingleton.cpp
     dolphinrecenttabsmenu.cpp
     dolphintabpage.cpp
     dolphintabwidget.cpp
+    trash/dolphintrash.cpp
     filterbar/filterbar.cpp
-    main.cpp
     panels/information/filemetadataconfigurationdialog.cpp
     panels/information/informationpanel.cpp
     panels/information/informationpanelcontent.cpp
@@ -223,6 +221,7 @@ set(dolphinstatic_SRCS
     panels/folders/foldersitemlistwidget.cpp
     panels/folders/treeviewcontextmenu.cpp
     panels/folders/folderspanel.cpp
+    panels/terminal/terminalpanel.cpp
     search/dolphinfacetswidget.cpp
     search/dolphinsearchbox.cpp
     settings/general/behaviorsettingspage.cpp
@@ -265,15 +264,11 @@ kconfig_add_kcfg_files(dolphinstatic_SRCS GENERATE_MOC
     settings/dolphin_versioncontrolsettings.kcfgc
 )
 
-if(NOT WIN32)
-   set(dolphinstatic_SRCS ${dolphinstatic_SRCS} panels/terminal/terminalpanel.cpp)
-endif()
-
 qt5_add_resources(dolphinstatic_SRCS dolphin.qrc)
 
 add_library(dolphinstatic STATIC ${dolphinstatic_SRCS})
 
-target_include_directories(dolphinstatic PRIVATE ${PHONON_INCLUDES})
+target_include_directories(dolphinstatic SYSTEM PRIVATE ${PHONON_INCLUDES})
 target_link_libraries(dolphinstatic
     dolphinprivate
     KF5::KCMUtils
@@ -301,7 +296,7 @@ ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
 kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
 
 
-target_link_libraries(kdeinit_dolphin
+target_link_libraries(kdeinit_dolphin PRIVATE
     dolphinstatic
     dolphinprivate
 )