Merge branch 'KDE/4.10'

Conflicts:
	dolphin/src/CMakeLists.txt

diff --combined src/CMakeLists.txt
index 9f650ce4387c9132e5afdd7eafac96a2d7193ae9,b7aa5b3856510b141de6ac7548b8e4fa0207e604..a0beafa80c58e27fe65f7d21b679c48307b23d4f
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -1,28 -1,18 +1,30 @@@
 -macro_optional_find_package(Soprano)
  macro_optional_find_package(NepomukCore)
 -macro_optional_find_package(NepomukWidgets)
 -macro_log_feature(NepomukCore_FOUND "Nepomuk" "Nepomuk" "http://www.kde.org" FALSE "" "For adding desktop-wide tagging support to dolphin")
 +set_package_properties(NepomukCore PROPERTIES DESCRIPTION "Nepomuk Core libraries"
 +                       URL "http://www.kde.org"
 +                       TYPE OPTIONAL
 +                       PURPOSE "For adding desktop-wide tagging support to dolphin"
 +                      )
 +
  macro_bool_to_01(NepomukCore_FOUND HAVE_NEPOMUK)
  configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
  
++macro_optional_find_package(NepomukWidgets)
++
  macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
  configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
  
  include_directories( ${KACTIVITIES_INCLUDE_DIRS} )
  
  if (NepomukCore_FOUND)
 +  find_package(Soprano 2.7.56)
 +  set_package_properties(Soprano PROPERTIES DESCRIPTION "Qt-based RDF storage and parsing solution"
 +                         URL "http://soprano.sourceforge.net"
 +                         TYPE REQUIRED
 +                         PURPOSE "Required for everything (storage and general data management)"
 +                        )
 +
    # Yes, Soprano includes is what we need here
-   include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_CORE_INCLUDE_DIR} )
+   include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_CORE_INCLUDE_DIR} ${NEPOMUK_WIDGETS_INCLUDE_DIR} )
  endif (NepomukCore_FOUND)
  
  add_subdirectory(tests)
@@@ -114,6 -104,7 +116,7 @@@ if (NepomukCore_FOUND
      target_link_libraries(
          dolphinprivate
          ${NEPOMUK_CORE_LIBRARY}
+         ${NEPOMUK_WIDGETS_LIBRARY}
          ${SOPRANO_LIBRARIES}
      )
  endif (NepomukCore_FOUND)
@@@ -239,6 -230,7 +242,7 @@@ target_link_libraries(kdeinit_dolphi
  if (NepomukCore_FOUND)
      target_link_libraries(kdeinit_dolphin
          ${NEPOMUK_CORE_LIBRARY}
+         ${NEPOMUK_WIDGETS_LIBRARY}
          ${SOPRANO_LIBRARIES}
      )
  endif (NepomukCore_FOUND)
@@@ -313,10 -305,10 +317,10 @@@ target_link_libraries(kcm_dolphinnaviga
  target_link_libraries(kcm_dolphinservices  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBRARY} dolphinprivate)
  target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate)
  if (NepomukCore_FOUND)
-   target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_CORE_LIBRARY})
-   target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_CORE_LIBRARY})
-   target_link_libraries(kcm_dolphinservices ${NEPOMUK_CORE_LIBRARY})
-   target_link_libraries(kcm_dolphingeneral ${NEPOMUK_CORE_LIBRARY})
+   target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
+   target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
+   target_link_libraries(kcm_dolphinservices ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
+   target_link_libraries(kcm_dolphingeneral ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
  endif (NepomukCore_FOUND)
  
  install(TARGETS kcm_dolphinviewmodes DESTINATION ${PLUGIN_INSTALL_DIR} )