Fix temporary regression of sorting introduced by SVN commit 1126410

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 264fc6ec19fcba2766d1b75bde4f1ebb9bb10bc8..e266fd1ccddd89e26c7e69081f3f679021d55129 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,8 +16,9 @@ endif (Nepomuk_FOUND)
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
-    dolphincontroller.cpp
+    additionalinfoaccessor.cpp
     dolphindetailsview.cpp
+    dolphindetailsviewexpander.cpp
     dolphiniconsview.cpp
     dolphincolumnview.cpp
     dolphincolumnviewcontainer.cpp
@@ -30,8 +31,8 @@ set(dolphinprivate_LIB_SRCS
     dolphinview.cpp
     dolphinviewactionhandler.cpp
     dolphinviewautoscroller.cpp
+    dolphinviewcontroller.cpp
     dolphinremoteencoding.cpp
-    dolphindetailsviewexpander.cpp
     draganddrophelper.cpp
     folderexpander.cpp
     renamedialog.cpp
@@ -40,31 +41,20 @@ set(dolphinprivate_LIB_SRCS
     settings/additionalinfodialog.cpp
     settings/applyviewpropsjob.cpp
     settings/dolphinsettings.cpp
+    settings/filemetadataconfigurationdialog.cpp
     settings/viewpropertiesdialog.cpp
     settings/viewpropsprogressinfo.cpp
-    panels/information/kmetadatawidget.cpp
-    panels/information/kmetadataconfigurationdialog.cpp
-    tooltips/ktooltip.cpp
-    tooltips/ktooltipwindow.cpp
+    tooltips/filemetadatatooltip.cpp
     tooltips/tooltipmanager.cpp
+    versioncontrol/pendingthreadsmaintainer.cpp
     versioncontrol/updateitemstatesthread.cpp
     versioncontrol/versioncontrolobserver.cpp
     viewextensionsfactory.cpp
+    viewmodecontroller.cpp
     viewproperties.cpp
     zoomlevelinfo.cpp
 )
 
-if(Nepomuk_FOUND)
-    set(dolphinprivate_LIB_SRCS
-        ${dolphinprivate_LIB_SRCS}
-        panels/information/kcommentwidget.cpp
-        panels/information/kedittagsdialog.cpp
-        panels/information/kloadmetadatathread.cpp
-        panels/information/nepomukmassupdatejob.cpp
-        panels/information/ktaggingwidget.cpp
-    )
-endif(Nepomuk_FOUND)
-
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
     settings/dolphin_columnmodesettings.kcfgc
     settings/dolphin_directoryviewpropertysettings.kcfgc
@@ -92,22 +82,14 @@ set(dolphinpart_SRCS
    dolphinpart.cpp
 )
 
-set(fileviewsvnplugin_SRCS
-    versioncontrol/fileviewsvnplugin.cpp
-)
-
 kde4_add_plugin(dolphinpart ${dolphinpart_SRCS})
-kde4_add_plugin(fileviewsvnplugin ${fileviewsvnplugin_SRCS})
 
 target_link_libraries(dolphinpart dolphinprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS})
-target_link_libraries(fileviewsvnplugin ${KDE4_KIO_LIBS} konq)
 
 install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR})
-install(TARGETS fileviewsvnplugin DESTINATION ${PLUGIN_INSTALL_DIR})
 
 install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart)
 install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install(FILES versioncontrol/fileviewsvnplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 install(FILES versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
 ##########################################
@@ -124,8 +106,6 @@ set(dolphin_SRCS
     pixmapviewer.cpp
     panels/information/informationpanel.cpp
     panels/information/informationpanelcontent.cpp
-    panels/information/kmetadatawidget.cpp
-    panels/information/kmetadataconfigurationdialog.cpp
     panels/information/phononwidget.cpp
     panels/folders/ktreeview.cpp
     panels/places/placespanel.cpp
@@ -163,16 +143,12 @@ kde4_add_kcfg_files(dolphin_SRCS
     panels/folders/dolphin_folderspanelsettings.kcfgc
     panels/information/dolphin_informationpanelsettings.kcfgc
     search/dolphin_searchsettings.kcfgc
+    settings/dolphin_versioncontrolsettings.kcfgc
 )
 
 if(Nepomuk_FOUND)
     set(dolphin_SRCS
         ${dolphin_SRCS}
-        panels/information/kcommentwidget.cpp
-        panels/information/kedittagsdialog.cpp
-        panels/information/kloadmetadatathread.cpp
-        panels/information/nepomukmassupdatejob.cpp
-        panels/information/ktaggingwidget.cpp
         search/dolphinsearchoptionsconfigurator.cpp
         search/searchcriteriondescription.cpp
         search/searchcriterionselector.cpp
@@ -199,12 +175,12 @@ qt4_add_dbus_adaptor(dolphin_SRCS
 
 kde4_add_app_icon(dolphin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/system-file-manager.png")
 
-kde4_add_executable(dolphin ${dolphin_SRCS})
+kde4_add_kdeinit_executable(dolphin ${dolphin_SRCS})
 
-target_link_libraries(dolphin
+target_link_libraries(kdeinit_dolphin
     ${KDE4_KDEPRINT_LIBS}
     ${KDE4_KFILE_LIBS}
-    ${KDE4_KUTILS_LIBRARY}
+    ${KDE4_KCMUTILS_LIBRARY}
     konq
     dolphinprivate
     knewstuff3
@@ -212,13 +188,14 @@ target_link_libraries(dolphin
 )
 
 if (Nepomuk_FOUND)
-    target_link_libraries(dolphin
+    target_link_libraries(kdeinit_dolphin
         ${NEPOMUK_LIBRARIES}
         ${SOPRANO_LIBRARIES}
         ${NEPOMUK_QUERY_LIBRARIES}
     )
 endif (Nepomuk_FOUND)
 
+install(TARGETS kdeinit_dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ##########################################
@@ -246,22 +223,10 @@ set(kcm_dolphinservices_PART_SRCS
 
 set(kcm_dolphingeneral_PART_SRCS
     kcm/kcmdolphingeneral.cpp
-    panels/information/kmetadataconfigurationdialog.cpp
-    panels/information/kmetadatawidget.cpp
     settings/behaviorsettingspage.cpp
     settings/previewssettingspage.cpp
     settings/contextmenusettingspage.cpp
     settings/settingspagebase.cpp)
-if (Nepomuk_FOUND)
-    set(kcm_dolphingeneral_PART_SRCS
-        ${kcm_dolphingeneral_PART_SRCS}
-        panels/information/kcommentwidget.cpp
-        panels/information/kedittagsdialog.cpp
-        panels/information/kloadmetadatathread.cpp
-        panels/information/nepomukmassupdatejob.cpp
-        panels/information/ktaggingwidget.cpp
-    )
-endif (Nepomuk_FOUND)
 
 kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS
     settings/dolphin_columnmodesettings.kcfgc
@@ -276,7 +241,8 @@ kde4_add_kcfg_files(kcm_dolphinnavigation_PART_SRCS
     settings/dolphin_generalsettings.kcfgc)
 
 kde4_add_kcfg_files(kcm_dolphinservices_PART_SRCS
-    settings/dolphin_generalsettings.kcfgc)
+    settings/dolphin_generalsettings.kcfgc
+    settings/dolphin_versioncontrolsettings.kcfgc)
 
 kde4_add_kcfg_files(kcm_dolphingeneral_PART_SRCS
     settings/dolphin_generalsettings.kcfgc)