Merge branch 'Applications/16.04'

[dolphin.git] / src / tests / kfileitemlistviewtest.cpp

diff --git a/src/tests/kfileitemlistviewtest.cpp b/src/tests/kfileitemlistviewtest.cpp
index 9e1add8cf36c620df9ec37a7c5bbb09c7819044d..cac4f7a587bf520901fe58eb124b664013eeb24a 100644 (file)
--- a/src/tests/kfileitemlistviewtest.cpp
+++ b/src/tests/kfileitemlistviewtest.cpp
@@ -56,7 +56,7 @@ void KFileItemListViewTest::init()
 
     m_graphicsView = new QGraphicsView();
     m_graphicsView->show();
 
     m_graphicsView = new QGraphicsView();
     m_graphicsView->show();

-    QTest::qWaitForWindowShown(m_graphicsView);
+    QTest::qWaitForWindowExposed(m_graphicsView);

 }
 
 void KFileItemListViewTest::cleanup()
 }
 
 void KFileItemListViewTest::cleanup()


@@ -87,8 +87,10 @@ void KFileItemListViewTest::cleanup()
  */
 void KFileItemListViewTest::testGroupedItemChanges()
 {
  */
 void KFileItemListViewTest::testGroupedItemChanges()
 {

-    QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
-    QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
+    QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList)));
+    QVERIFY(itemsInsertedSpy.isValid());
+    QSignalSpy itemsRemovedSpy(m_model, SIGNAL(itemsRemoved(KItemRangeList)));
+    QVERIFY(itemsRemovedSpy.isValid());

 
     m_model->setGroupedSorting(true);
 
 
     m_model->setGroupedSorting(true);