From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Sun, 25 May 2014 12:43:18 +0000 (+0200)
Subject: Merge branch 'master' into frameworks
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/fa36c3fd1f53a223f43bb57d7c28e431a889a7c2?hp=-c

Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/statusbar/statusbarspaceinfo.cpp
---

fa36c3fd1f53a223f43bb57d7c28e431a889a7c2
diff --combined src/CMakeLists.txt
index cd9017bc7,0a72721a9..767cf7fe3
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -1,17 -1,17 +1,17 @@@
 -macro_optional_find_package(Baloo)
 +find_package(Baloo 4.97)
  set_package_properties(Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"
                         URL "http://www.kde.org"
                         TYPE OPTIONAL
                         PURPOSE "For adding desktop-wide search and tagging support to dolphin"
                        )
  
 -macro_optional_find_package(BalooWidgets)
 +find_package(BalooWidgets 4.97)
  set_package_properties(BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets"
                         URL "http://www.kde.org"
                         TYPE OPTIONAL
                        )
  
 -macro_optional_find_package(KFileMetaData)
 +find_package(KFileMetaData 4.97)
  set_package_properties(KFileMetaData PROPERTIES
                         URL "https://projects.kde.org/kfilemetadata"
                         TYPE OPTIONAL
@@@ -22,10 -22,6 +22,10 @@@ if (Baloo_FOUND AND BalooWidgets_FOUND 
      set(HAVE_BALOO TRUE)
  endif()
  
 +find_package(KF5NewStuff CONFIG REQUIRED)
 +find_package(KF5KCMUtils CONFIG REQUIRED)
 +find_package(Phonon4Qt5 CONFIG REQUIRED)
 +
  configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h )
  
  macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
@@@ -53,7 -49,7 +53,7 @@@ set(dolphinprivate_LIB_SRC
      kitemviews/kitemlistselectionmanager.cpp
      kitemviews/kitemliststyleoption.cpp
      kitemviews/kitemlistview.cpp
 -    kitemviews/kitemlistviewaccessible.cpp
 +#    kitemviews/kitemlistviewaccessible.cpp
      kitemviews/kitemlistwidget.cpp
      kitemviews/kitemmodelbase.cpp
      kitemviews/kitemset.cpp
@@@ -120,19 -116,18 +120,19 @@@ kde4_add_kcfg_files(dolphinprivate_LIB_
  kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
  
  target_link_libraries(
 -    dolphinprivate
 -    ${KDE4_KFILE_LIBS}
 +    dolphinprivate PUBLIC
      konq
 -    ${KDE4_KNEWSTUFF3_LIBS}
 +    KF5::NewStuff
 +    KF5::KDELibs4Support
  )
  
  if(HAVE_BALOO)
      target_link_libraries(
 -        dolphinprivate
 -        ${BALOO_LIBRARIES}
 +        dolphinprivate PUBLIC
 +        KF5::FileMetaData
 +        ${BALOO_CORE_LIBRARY}
 +        ${BALOO_FILE_LIBRARY}
          ${BALOO_WIDGETS_LIBRARY}
 -        ${KFILEMETADATA_LIBRARY}
      )
  endif()
  
@@@ -140,6 -135,8 +140,6 @@@ if(X11_Xrender_FOUND
      target_link_libraries(dolphinprivate ${X11_Xrender_LIB})
  endif(X11_Xrender_FOUND)
  
 -target_link_libraries(dolphinprivate ${KDE4_PLASMA_LIBS})
 -
  set_target_properties(dolphinprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS dolphinprivate  ${INSTALL_TARGETS_DEFAULT_ARGS})
  
@@@ -147,9 -144,15 +147,9 @@@
  
  set(dolphinpart_SRCS
     dolphinpart.cpp
 +   dolphinpart_ext.cpp
  )
  
 -# Add dolphinpart_ext.cpp conditionally, only with KDE > 4.9.1.
 -if (${KDE_VERSION} VERSION_GREATER "4.9.1")
 -set(dolphinpart_SRCS
 -    ${dolphinpart_SRCS}
 -    dolphinpart_ext.cpp)
 -endif (${KDE_VERSION} VERSION_GREATER "4.9.1")
 -
  kde4_add_plugin(dolphinpart ${dolphinpart_SRCS})
  
  target_link_libraries(dolphinpart dolphinprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS})
@@@ -208,6 -211,9 +208,9 @@@ set(dolphin_SRC
      settings/viewmodes/viewmodesettings.cpp
      settings/viewmodes/viewsettingstab.cpp
      statusbar/dolphinstatusbar.cpp
+     statusbar/mountpointobserver.cpp
+     statusbar/mountpointobservercache.cpp
+     statusbar/spaceinfoobserver.cpp
      statusbar/statusbarspaceinfo.cpp
      views/zoomlevelinfo.cpp
  )
@@@ -232,25 -238,31 +235,25 @@@ kde4_add_app_icon(dolphin_SRCS "${KDE4_
  
  kde4_add_kdeinit_executable(dolphin ${dolphin_SRCS})
  
 +target_include_directories(kdeinit_dolphin PRIVATE ${PHONON_INCLUDES})
 +
  target_link_libraries(kdeinit_dolphin
 -    ${KDE4_KDEPRINT_LIBS}
 -    ${KDE4_KFILE_LIBS}
 -    ${KDE4_KPARTS_LIBS}
 -    ${KDE4_KCMUTILS_LIBRARY}
      konq
      dolphinprivate
 -    knewstuff3
 -    ${KDE4_SOLID_LIBS}
 -    ${KDE4_PHONON_LIBS}
 +    KF5::NewStuff
 +    KF5::Parts
 +    KF5::KCMUtils
 +    KF5::Solid
 +    Phonon::phonon4qt5
 +    KF5::KDELibs4Support
  )
  
 -if(HAVE_BALOO)
 -    target_link_libraries(kdeinit_dolphin
 -        ${BALOO_LIBRARIES}
 -        ${BALOO_WIDGETS_LIBRARY}
 -    )
 -endif()
 -
 -if (KActivities_FOUND)
 +if (KF5Activities_FOUND)
      target_link_libraries(
          kdeinit_dolphin
 -        ${KACTIVITIES_LIBRARY}
 +        KF5::Activities
      )
 -endif (KActivities_FOUND)
 +endif()
  
  install(TARGETS kdeinit_dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
  install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})