From: Ivan Čukić <ivan.cukic@kde.org>
Date: Wed, 15 Aug 2012 06:24:17 +0000 (+0200)
Subject: Merge branch 'ivan/dolphin-activities'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/50eaec7a81faaeccc5dbcc2f47cbd982a7dd7207?hp=-c

Merge branch 'ivan/dolphin-activities'
REVIEW:105973
---

50eaec7a81faaeccc5dbcc2f47cbd982a7dd7207
diff --combined src/CMakeLists.txt
index afc190f83,2ab6e5e33..8ade48777
--- a/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})