Fix for crash which was introduced by commit

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cc358a245c896a6e27a7eb7c5ca58c797284cc47..f132e2844d54d08fa99b6c5ef8c5da6dfdb07514 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,6 @@ configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h)
 configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h)
 
 add_definitions(-DTRANSLATION_DOMAIN=\"dolphin\")
-add_definitions(-Wno-deprecated-declarations)
 remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_URL_CAST_FROM_STRING)
 
 if(X11_Xrender_FOUND)
@@ -27,7 +26,7 @@ set(dolphinprivate_LIB_SRCS
     kitemviews/kitemlistselectionmanager.cpp
     kitemviews/kitemliststyleoption.cpp
     kitemviews/kitemlistview.cpp
-#    kitemviews/kitemlistviewaccessible.cpp
+    kitemviews/kitemlistviewaccessible.cpp
     kitemviews/kitemlistwidget.cpp
     kitemviews/kitemmodelbase.cpp
     kitemviews/kitemset.cpp
@@ -93,6 +92,9 @@ kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS
 
 add_library(dolphinprivate ${dolphinprivate_LIB_SRCS})
 
+generate_export_header(dolphinprivate BASE_NAME libdolphinprivate
+  EXPORT_FILE_NAME libdolphin_export.h)
+
 target_link_libraries(
     dolphinprivate PUBLIC
     KF5::KDELibs4Support
@@ -104,8 +106,8 @@ if(HAVE_BALOO)
     target_link_libraries(
         dolphinprivate PUBLIC
         KF5::FileMetaData
-        KF5::BalooCore
-        KF5::BalooFiles
+        KF5::Baloo
+        KF5::BalooNaturalQueryParser
         KF5::BalooWidgets
     )
 endif()
@@ -138,7 +140,7 @@ target_link_libraries(dolphinpart
 
 install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR})
 
-install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart)
+install(FILES dolphinpart.rc DESTINATION ${CMAKE_INSTALL_KXMLGUI5DIR}/dolphinpart)
 install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
@@ -153,6 +155,7 @@ set(dolphin_SRCS
     dolphintabbar.cpp
     dolphinrecenttabsmenu.cpp
     dolphintabpage.cpp
+    dolphintabwidget.cpp
     filterbar/filterbar.cpp
     main.cpp
     panels/information/filemetadataconfigurationdialog.cpp
@@ -309,20 +312,9 @@ install(TARGETS kcm_dolphinnavigation DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(TARGETS kcm_dolphinservices DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(TARGETS kcm_dolphingeneral DESTINATION ${PLUGIN_INSTALL_DIR} )
 
-#########################################
-
-set(kio_search_PART_SRCS
-    search/filenamesearchprotocol.cpp)
-
-add_library(kio_filenamesearch MODULE ${kio_search_PART_SRCS})
-
-target_link_libraries(kio_filenamesearch KF5::KDELibs4Support)
-
-install(TARGETS kio_filenamesearch DESTINATION ${PLUGIN_INSTALL_DIR})
-
 ########### install files ###############
 
-install( PROGRAMS dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS org.kde.dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_generalsettings.kcfg
                settings/dolphin_compactmodesettings.kcfg
@@ -330,9 +322,8 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_detailsmodesettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg
          DESTINATION ${KCFG_INSTALL_DIR} )
-install( FILES dolphinui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/dolphin )
+install( FILES dolphinui.rc DESTINATION ${CMAKE_INSTALL_KXMLGUI5DIR}/dolphin )
 install( FILES dolphin.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata )
-install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
 ${SERVICES_INSTALL_DIR} )
 install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )