Merge branch 'KDE/4.10'

Conflicts:
	dolphin/src/CMakeLists.txt

diff --cc src/CMakeLists.txt
index 9f650ce4387c9132e5afdd7eafac96a2d7193ae9,b7aa5b3856510b141de6ac7548b8e4fa0207e604..a0beafa80c58e27fe65f7d21b679c48307b23d4f
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -8,21 -5,14 +8,23 @@@ set_package_properties(NepomukCore PROP
  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)