Merge branch 'ivan/dolphin-activities'

REVIEW:105973

diff --combined src/CMakeLists.txt
index afc190f8324785b910d49a360bb4e79b2b11543f,2ab6e5e33c375e7f2c0ce77c2e586ac01d9c5d86..8ade48777b1eec43d983fbe6d665c06d968ed777
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -165,7 -165,6 +165,7 @@@ set(dolphin_SRC
      panels/places/placesitemmodel.cpp
      panels/places/placesitemsignalhandler.cpp
      panels/panel.cpp
 +    panels/folders/foldersitemlistwidget.cpp
      panels/folders/treeviewcontextmenu.cpp
      panels/folders/folderspanel.cpp
      search/dolphinfacetswidget.cpp
@@@ -234,6 -233,13 +234,13 @@@ if (Nepomuk_FOUND
      )
  endif (Nepomuk_FOUND)
  
+ if (KActivities_FOUND)
+     target_link_libraries(
+         kdeinit_dolphin
+         ${KACTIVITIES_LIBRARY}
+     )
+ endif (KActivities_FOUND)
+ 
  install(TARGETS kdeinit_dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
  install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})