From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sun, 12 May 2013 08:04:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/600166152d857ccfc9df15b25bd1237b74c71d43?hp=-c

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

600166152d857ccfc9df15b25bd1237b74c71d43
diff --combined src/tests/CMakeLists.txt
index 83989d22c,84c2e5ae5..dd761fc90
--- a/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