[PlacesItemModelTest] Try to use an event loop instead of an hardcoded timeout

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 069096814d5e0ce88aac8ad405755a839c5c4d49..5aff4b0fadcac1912962e20146ce6532cce7b1e7 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,4 @@
+include(ECMAddAppIcon)

 
 configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h)
 
 
 configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h)
 


@@ -5,12 +6,9 @@ configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin
 
 add_definitions(
     -DTRANSLATION_DOMAIN=\"dolphin\"
 
 add_definitions(
     -DTRANSLATION_DOMAIN=\"dolphin\"

-    -DQT_USE_FAST_CONCATENATION
-    -DQT_USE_FAST_OPERATOR_PLUS

 )
 remove_definitions(
     -DQT_NO_CAST_FROM_BYTEARRAY
 )
 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
     -DQT_NO_SIGNALS_SLOTS_KEYWORDS
     -DQT_NO_CAST_FROM_ASCII
     -DQT_NO_CAST_TO_ASCII


@@ -88,7 +86,6 @@ set(dolphinprivate_LIB_SRCS
     kitemviews/private/kitemlistviewanimation.cpp
     kitemviews/private/kitemlistviewlayouter.cpp
     kitemviews/private/kpixmapmodifier.cpp
     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
     settings/applyviewpropsjob.cpp
     settings/viewmodes/viewmodesettings.cpp
     settings/viewpropertiesdialog.cpp


@@ -101,14 +98,13 @@ set(dolphinprivate_LIB_SRCS
     views/dolphinviewactionhandler.cpp
     views/draganddrophelper.cpp
     views/renamedialog.cpp
     views/dolphinviewactionhandler.cpp
     views/draganddrophelper.cpp
     views/renamedialog.cpp

-    views/tooltips/filemetadatatooltip.cpp
-    views/tooltips/tooltipmanager.cpp

     views/versioncontrol/updateitemstatesthread.cpp
     views/versioncontrol/versioncontrolobserver.cpp
     views/viewmodecontroller.cpp
     views/viewproperties.cpp
     views/zoomlevelinfo.cpp
     dolphinremoveaction.cpp
     views/versioncontrol/updateitemstatesthread.cpp
     views/versioncontrol/versioncontrolobserver.cpp
     views/viewmodecontroller.cpp
     views/viewproperties.cpp
     views/zoomlevelinfo.cpp
     dolphinremoveaction.cpp

+    middleclickactioneventfilter.cpp

     dolphinnewfilemenu.cpp
     dolphindebug.cpp
 )
     dolphinnewfilemenu.cpp
     dolphindebug.cpp
 )


@@ -116,6 +112,8 @@ set(dolphinprivate_LIB_SRCS
 if(HAVE_BALOO)
     set(dolphinprivate_LIB_SRCS
         ${dolphinprivate_LIB_SRCS}
 if(HAVE_BALOO)
     set(dolphinprivate_LIB_SRCS
         ${dolphinprivate_LIB_SRCS}

+        views/tooltips/dolphinfilemetadatawidget.cpp
+        views/tooltips/tooltipmanager.cpp

         kitemviews/private/kbaloorolesprovider.cpp
     )
 endif()
         kitemviews/private/kbaloorolesprovider.cpp
     )
 endif()


@@ -135,6 +133,7 @@ generate_export_header(dolphinprivate BASE_NAME dolphin)
 target_link_libraries(
     dolphinprivate PUBLIC
     dolphinvcs
 target_link_libraries(
     dolphinprivate PUBLIC
     dolphinvcs

+    Qt5::Concurrent

     Qt5::Gui
     KF5::Crash
     KF5::I18n
     Qt5::Gui
     KF5::Crash
     KF5::I18n


@@ -144,7 +143,6 @@ target_link_libraries(
     KF5::KIOFileWidgets
     KF5::Completion
     KF5::TextWidgets
     KF5::KIOFileWidgets
     KF5::Completion
     KF5::TextWidgets

-    KF5::WindowSystem

     KF5::ConfigCore
     KF5::NewStuff
     KF5::Parts
     KF5::ConfigCore
     KF5::NewStuff
     KF5::Parts


@@ -157,11 +155,6 @@ if(HAVE_BALOO)
         KF5::Baloo
         KF5::BalooWidgets
     )
         KF5::Baloo
         KF5::BalooWidgets
     )

-else()
-    target_link_libraries(
-        dolphinprivate PUBLIC
-        KF5::KDELibs4Support # for KFileMetaDataWidget
-    )

 endif()
 
 set_target_properties(dolphinprivate PROPERTIES
 endif()
 
 set_target_properties(dolphinprivate PROPERTIES


@@ -180,6 +173,8 @@ set(dolphinpart_SRCS
    dolphindebug.cpp
 )
 
    dolphindebug.cpp
 )
 

+qt5_add_resources(dolphinpart_SRCS dolphinpart.qrc)
+

 add_library(dolphinpart MODULE ${dolphinpart_SRCS})
 
 target_link_libraries(dolphinpart
 add_library(dolphinpart MODULE ${dolphinpart_SRCS})
 
 target_link_libraries(dolphinpart


@@ -188,27 +183,22 @@ target_link_libraries(dolphinpart
 
 install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
 
 
 install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
 

-install(FILES dolphinpart.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/dolphinpart)

 install(FILES dolphinpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
 ##########################################
 
 install(FILES dolphinpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
 ##########################################
 

-set(dolphin_SRCS
+set(dolphinstatic_SRCS

     dolphindockwidget.cpp
     dolphinmainwindow.cpp
     dolphinviewcontainer.cpp
     dolphincontextmenu.cpp
     dolphintabbar.cpp
     dolphindockwidget.cpp
     dolphinmainwindow.cpp
     dolphinviewcontainer.cpp
     dolphincontextmenu.cpp
     dolphintabbar.cpp

+    dolphinplacesmodelsingleton.cpp

     dolphinrecenttabsmenu.cpp
     dolphintabpage.cpp
     dolphintabwidget.cpp
     dolphinrecenttabsmenu.cpp
     dolphintabpage.cpp
     dolphintabwidget.cpp

+    trash/dolphintrash.cpp

     filterbar/filterbar.cpp
     filterbar/filterbar.cpp

-    main.cpp
-    panels/information/filemetadataconfigurationdialog.cpp
-    panels/information/informationpanel.cpp
-    panels/information/informationpanelcontent.cpp
-    panels/information/pixmapviewer.cpp
-    panels/information/phononwidget.cpp

     panels/places/placespanel.cpp
     panels/places/placesitem.cpp
     panels/places/placesitemeditdialog.cpp
     panels/places/placespanel.cpp
     panels/places/placesitem.cpp
     panels/places/placesitemeditdialog.cpp


@@ -221,6 +211,7 @@ set(dolphin_SRCS
     panels/folders/foldersitemlistwidget.cpp
     panels/folders/treeviewcontextmenu.cpp
     panels/folders/folderspanel.cpp
     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
     search/dolphinfacetswidget.cpp
     search/dolphinsearchbox.cpp
     settings/general/behaviorsettingspage.cpp


@@ -248,11 +239,21 @@ set(dolphin_SRCS
     statusbar/statusbarspaceinfo.cpp
     views/zoomlevelinfo.cpp
     dolphindebug.cpp
     statusbar/statusbarspaceinfo.cpp
     views/zoomlevelinfo.cpp
     dolphindebug.cpp

-    dbusinterface.cpp

     global.cpp
 )
 
     global.cpp
 )
 

-kconfig_add_kcfg_files(dolphin_SRCS GENERATE_MOC
+if(HAVE_BALOO)
+    set(dolphinstatic_SRCS
+        ${dolphinstatic_SRCS}
+        panels/information/filemetadataconfigurationdialog.cpp
+        panels/information/informationpanel.cpp
+        panels/information/informationpanelcontent.cpp
+        panels/information/pixmapviewer.cpp
+        panels/information/phononwidget.cpp
+    )
+endif()
+
+kconfig_add_kcfg_files(dolphinstatic_SRCS GENERATE_MOC

     panels/folders/dolphin_folderspanelsettings.kcfgc
     panels/information/dolphin_informationpanelsettings.kcfgc
     panels/places/dolphin_placespanelsettings.kcfgc
     panels/folders/dolphin_folderspanelsettings.kcfgc
     panels/information/dolphin_informationpanelsettings.kcfgc
     panels/places/dolphin_placespanelsettings.kcfgc


@@ -264,36 +265,43 @@ kconfig_add_kcfg_files(dolphin_SRCS GENERATE_MOC
     settings/dolphin_versioncontrolsettings.kcfgc
 )
 
     settings/dolphin_versioncontrolsettings.kcfgc
 )
 

-if(NOT WIN32)
-   set(dolphin_SRCS ${dolphin_SRCS} panels/terminal/terminalpanel.cpp)
-endif()
-
-# TODO Does anything replace kde4_add_app_icon ?
-#kde4_add_app_icon(dolphin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/system-file-manager.png")
-
-kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
+qt5_add_resources(dolphinstatic_SRCS dolphin.qrc)

 
 

-target_include_directories(kdeinit_dolphin PRIVATE ${PHONON_INCLUDES})
+add_library(dolphinstatic STATIC ${dolphinstatic_SRCS})

 
 

-target_link_libraries(kdeinit_dolphin
+target_include_directories(dolphinstatic SYSTEM PRIVATE ${PHONON_INCLUDES})
+target_link_libraries(dolphinstatic

     dolphinprivate
     dolphinprivate

-    KF5::Parts

     KF5::KCMUtils
     KF5::KCMUtils

-    KF5::Solid
-    KF5::CoreAddons

     KF5::DBusAddons
     KF5::DBusAddons

-    KF5::Bookmarks

     KF5::Notifications
     Phonon::phonon4qt5
 )
 
 if (KF5Activities_FOUND)
     target_link_libraries(
     KF5::Notifications
     Phonon::phonon4qt5
 )
 
 if (KF5Activities_FOUND)
     target_link_libraries(

-        kdeinit_dolphin
+        dolphinstatic

         KF5::Activities
     )
 endif()
 
         KF5::Activities
     )
 endif()
 

+set(dolphin_SRCS
+    dbusinterface.cpp
+    main.cpp
+)
+
+# 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_SRCS ICONS ${ICONS_SRCS})
+
+kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
+
+
+target_link_libraries(kdeinit_dolphin PRIVATE
+    dolphinstatic
+    dolphinprivate
+)
+

 include(DbusInterfaceMacros)
 
 generate_and_install_dbus_interface(
 include(DbusInterfaceMacros)
 
 generate_and_install_dbus_interface(


@@ -381,7 +389,6 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_detailsmodesettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg
          DESTINATION ${KDE_INSTALL_KCFGDIR} )
                settings/dolphin_detailsmodesettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg
          DESTINATION ${KDE_INSTALL_KCFGDIR} )

-install( FILES dolphinui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/dolphin )

 install( FILES org.kde.dolphin.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
 install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
 ${KDE_INSTALL_KSERVICES5DIR} )
 install( FILES org.kde.dolphin.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
 install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
 ${KDE_INSTALL_KSERVICES5DIR} )