Remove SpaceInfoToolsMenu and use KMoreToolsMenuFactory instead

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf42fd06dc9b325341f21992876f9ec084c59683..498e7c596edcd3c4d6d8793a7af49a8ca9ccd083 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,12 +16,6 @@ remove_definitions(
     -DQT_NO_CAST_TO_ASCII
 )
 
-if(X11_Xrender_FOUND)
-    set(HAVE_XRENDER TRUE)
-endif()
-
-configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
-
 ##########################################
 
 set(dolphinvcs_LIB_SRCS
@@ -169,10 +163,6 @@ else()
     )
 endif()
 
-if(X11_Xrender_FOUND)
-    target_link_libraries(dolphinprivate ${X11_Xrender_LIB})
-endif(X11_Xrender_FOUND)
-
 set_target_properties(dolphinprivate PROPERTIES
     VERSION ${DOLPHINPRIVATE_VERSION_STRING}
     SOVERSION ${DOLPHINPRIVATE_SOVERSION}
@@ -252,11 +242,12 @@ set(dolphin_SRCS
     statusbar/dolphinstatusbar.cpp
     statusbar/mountpointobserver.cpp
     statusbar/mountpointobservercache.cpp
-    statusbar/spaceinfotoolsmenu.cpp
     statusbar/spaceinfoobserver.cpp
     statusbar/statusbarspaceinfo.cpp
     views/zoomlevelinfo.cpp
     dolphindebug.cpp
+    dbusinterface.cpp
+    global.cpp
 )
 
 kconfig_add_kcfg_files(dolphin_SRCS GENERATE_MOC
@@ -301,6 +292,15 @@ if (KF5Activities_FOUND)
     )
 endif()
 
+include(DbusInterfaceMacros)
+
+generate_and_install_dbus_interface(
+    kdeinit_dolphin
+    dbusinterface.h
+    org.freedesktop.FileManager1.xml
+    OPTIONS -a
+)
+
 install(TARGETS kdeinit_dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})