Merge remote-tracking branch 'origin/KDE/4.10'

diff --combined src/tests/CMakeLists.txt
index 83989d22c7b9e5e7e4104240b37726d43f846f72,84c2e5ae51bbb5dd1cefc3dd28c4074784c46dc5..dd761fc90b0113f81359e30a2fd2531a146e314a
--- 1/src/tests/CMakeLists.txt
--- 2/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@@ -18,6 -18,7 +18,7 @@@ set(kitemlistcontrollertest_SRC
      testdir.cpp
      ../kitemviews/kfileitemmodel.cpp
      ../kitemviews/kfileitemlistview.cpp
+     ../kitemviews/kfileitemlistwidget.cpp
      ../kitemviews/kitemmodelbase.cpp
      ../kitemviews/kitemlistview.cpp
      ../kitemviews/kitemlistcontainer.cpp
@@@ -56,16 -57,6 +57,16 @@@ set(kfileitemmodeltest_SRC
  kde4_add_unit_test(kfileitemmodeltest TEST ${kfileitemmodeltest_SRCS})
  target_link_libraries(kfileitemmodeltest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
  
 +# KFileItemModelBenchmark
 +set(kfileitemmodelbenchmark_SRCS
 +    kfileitemmodelbenchmark.cpp
 +    testdir.cpp
 +    ../kitemviews/kfileitemmodel.cpp
 +    ../kitemviews/kitemmodelbase.cpp
 +)
 +kde4_add_executable(kfileitemmodelbenchmark TEST ${kfileitemmodelbenchmark_SRCS})
 +target_link_libraries(kfileitemmodelbenchmark dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
 +
  # KItemListKeyboardSearchManagerTest
  set(kitemlistkeyboardsearchmanagertest_SRCS
      kitemlistkeyboardsearchmanagertest.cpp