From 657f72640b718fa58b4e4a0f47d4c39211281859 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 2 Dec 2011 08:58:49 +1000
Subject: [PATCH] Fix gridview test warning.

Also removed unnecessary QtQuick 1.1 test.

Change-Id: I6f048d22fbbaa817358da7bb5d85187fabc119ff
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
---
 .../qquickgridview/tst_qquickgridview.cpp          |   45 +-------------------
 1 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp b/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp
index 3370b72..503379a 100644
--- a/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp
@@ -110,8 +110,6 @@ private slots:
     void onAdd_data();
     void onRemove();
     void onRemove_data();
-    void testQtQuick11Attributes();
-    void testQtQuick11Attributes_data();
     void columnCount();
     void margins();
     void creationContext();
@@ -1928,10 +1926,10 @@ void tst_QQuickGridView::componentChanges()
     QTRY_VERIFY(gridView);
 
     QDeclarativeComponent component(canvas->engine());
-    component.setData("import QtQuick 1.0; Rectangle { color: \"blue\"; }", QUrl::fromLocalFile(""));
+    component.setData("import QtQuick 2.0; Rectangle { color: \"blue\"; }", QUrl::fromLocalFile(""));
 
     QDeclarativeComponent delegateComponent(canvas->engine());
-    delegateComponent.setData("import QtQuick 1.0; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
+    delegateComponent.setData("import QtQuick 2.0; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
 
     QSignalSpy highlightSpy(gridView, SIGNAL(highlightChanged()));
     QSignalSpy delegateSpy(gridView, SIGNAL(delegateChanged()));
@@ -3139,45 +3137,6 @@ void tst_QQuickGridView::onRemove_data()
     QTest::newRow("ten items, remove 4-10") << 10 << 4 << 6;
 }
 
-void tst_QQuickGridView::testQtQuick11Attributes()
-{
-    QFETCH(QString, code);
-    QFETCH(QString, warning);
-    QFETCH(QString, error);
-
-    QDeclarativeEngine engine;
-    QObject *obj;
-
-    QDeclarativeComponent valid(&engine);
-    valid.setData("import QtQuick 1.1; GridView { " + code.toUtf8() + " }", QUrl(""));
-    obj = valid.create();
-    QVERIFY(obj);
-    QVERIFY(valid.errorString().isEmpty());
-    delete obj;
-
-    QDeclarativeComponent invalid(&engine);
-    invalid.setData("import QtQuick 1.0; GridView { " + code.toUtf8() + " }", QUrl(""));
-    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
-    obj = invalid.create();
-    QCOMPARE(invalid.errorString(), error);
-    delete obj;
-}
-
-void tst_QQuickGridView::testQtQuick11Attributes_data()
-{
-    QTest::addColumn<QString>("code");
-    QTest::addColumn<QString>("warning");
-    QTest::addColumn<QString>("error");
-
-    QTest::newRow("positionViewAtBeginning") << "Component.onCompleted: positionViewAtBeginning()"
-        << "<Unknown File>:1: ReferenceError: Can't find variable: positionViewAtBeginning"
-        << "";
-
-    QTest::newRow("positionViewAtEnd") << "Component.onCompleted: positionViewAtEnd()"
-        << "<Unknown File>:1: ReferenceError: Can't find variable: positionViewAtEnd"
-        << "";
-}
-
 void tst_QQuickGridView::columnCount()
 {
     QQuickView canvas;
-- 
1.7.2.5