Merge branch 'KDE/4.10'

Conflicts:
	dolphin/src/CMakeLists.txt

diff --cc src/CMakeLists.txt
index a0beafa80c58e27fe65f7d21b679c48307b23d4f,41efa3589dbb2494c38f1faa4c6832bfff6a79c8..4b31ab6a9cfb6d2fe56b3d3003ebefd3306e5064
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -1,31 -1,23 +1,38 @@@
 -macro_optional_find_package(Soprano)
  macro_optional_find_package(NepomukCore)
- macro_bool_to_01(NepomukCore_FOUND HAVE_NEPOMUK)
- configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
- 
 +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_optional_find_package(NepomukWidgets)
 -macro_log_feature(NepomukCore_FOUND "Nepomuk Core" "Nepomuk Core functionality" "http://www.kde.org" FALSE "" "For fetching additional file metadata in dolphin")
 -macro_log_feature(NepomukWidgets_FOUND "Nepomuk Widgets" "Nepomuk Widgets" "http://www.kde.org" FALSE "" "For adding desktop-wide tagging support to dolphin")
++set_package_properties(NepomukWidgets PROPERTIES DESCRIPTION "Nepomuk Widgets"
++                       URL "http://www.kde.org"
++                       TYPE OPTIONAL
++                       PURPOSE "For adding desktop-wide tagging support to dolphin"
++                      )
++
+ if(NepomukCore_FOUND AND NepomukWidgets_FOUND)
+     set(HAVE_NEPOMUK TRUE)
+ endif()
+ 
+ configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
  
  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)
+ if(HAVE_NEPOMUK)
 -  # Yes, Soprano includes is what we need here
 +  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} ${NEPOMUK_WIDGETS_INCLUDE_DIR} )
- endif (NepomukCore_FOUND)
+ endif()
  
  add_subdirectory(tests)