Remove "All rights reserved" line from license headers.

[profile/ivi/qtdeclarative.git] / tests / auto / qtquick1 / qdeclarativelistview / tst_qdeclarativelistview.cpp

diff --git a/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp
index 5bfa08e..909c118 100644 (file)
--- a/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -35,12 +34,13 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtGui/QStringListModel>
+#include <QtCore/QStringListModel>
 #include <QtQuick1/qdeclarativeview.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecontext.h>
@@ -50,14 +50,8 @@
 #include <QtQuick1/private/qdeclarativetext_p.h>
 #include <QtQuick1/private/qdeclarativevisualitemmodel_p.h>
 #include <QtDeclarative/private/qlistmodelinterface_p.h>
-#include "../../../shared/util.h"
 #include "incrementalmodel.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QDeclarative1ListView : public QObject
 {
     Q_OBJECT
@@ -725,9 +719,16 @@ void tst_QDeclarative1ListView::removed(bool animated)
     QCOMPARE(name->text(), QString("New"));
 
     // Add some more items so that we don't run out
-    for (int i = 50; i < 100; i++)
+    model.clear();
+    for (int i = 0; i < 50; i++)
         model.addItem("Item" + QString::number(i), "");
 
+    // QTBUG-QTBUG-20575
+    listview->setCurrentIndex(0);
+    listview->setContentY(30);
+    model.removeItem(0);
+    QTRY_VERIFY(name = findItem<QDeclarative1Text>(contentItem, "textName", 0));
+
     // QTBUG-19198 move to end and remove all visible items one at a time.
     listview->positionViewAtEnd();
     for (int i = 0; i < 18; ++i)