From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sat, 11 May 2013 16:47:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/cad78cdfcf1f3b76acaadc7e9394df3ef466d770?hp=-c

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

Conflicts:
	CMakeLists.txt
---

cad78cdfcf1f3b76acaadc7e9394df3ef466d770
diff --combined src/tests/CMakeLists.txt
index 543261eac,1e1a161ff..83989d22c
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@@ -20,7 -20,11 +20,11 @@@ set(kitemlistcontrollertest_SRC
      ../kitemviews/kfileitemlistview.cpp
      ../kitemviews/kitemmodelbase.cpp
      ../kitemviews/kitemlistview.cpp
+     ../kitemviews/kitemlistcontainer.cpp
+     ../kitemviews/kitemlistwidget.cpp
      ../kitemviews/kitemlistviewaccessible.cpp
+     ../kitemviews/kstandarditemlistview.cpp
+     ../kitemviews/kstandarditemlistwidget.cpp
  )
  kde4_add_unit_test(kitemlistcontrollertest TEST ${kitemlistcontrollertest_SRCS})
  target_link_libraries(kitemlistcontrollertest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
@@@ -34,6 -38,10 +38,10 @@@ set(kfileitemlistviewtest_SRC
      ../kitemviews/kitemmodelbase.cpp
      ../kitemviews/kitemlistview.cpp
      ../kitemviews/kitemlistviewaccessible.cpp
+     ../kitemviews/kitemlistcontainer.cpp
+     ../kitemviews/kitemlistwidget.cpp
+     ../kitemviews/kstandarditemlistview.cpp
+     ../kitemviews/kstandarditemlistwidget.cpp
  )
  kde4_add_unit_test(kfileitemlistviewtest TEST ${kfileitemlistviewtest_SRCS})
  target_link_libraries(kfileitemlistviewtest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
@@@ -48,16 -56,6 +56,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