Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into api_changes

Change-Id: I578b1e2f1bb374da6194e6ba04a0fd459b2632fe

2 files changed, 0 insertions, 18 deletions

diff --git a/tests/auto/qml/qqmlecmascript/data/sequenceConversion.indexes.qml b/tests/auto/qml/qqmlecmascript/data/sequenceConversion.indexes.qml
index 23f1e90417..962e8dd474 100644
--- a/tests/auto/qml/qqmlecmascript/data/sequenceConversion.indexes.qml
+++ b/tests/auto/qml/qqmlecmascript/data/sequenceConversion.indexes.qml
@@ -71,19 +71,5 @@ Item {
             success = false;
         if (!verifyExpected(msco.intListProperty, 4))
             success = false;
-
-        // NOTE: while these two operations are technically
-        // fine, we expect std::bad_alloc exceptions here
-        // which we handle in the sequence wrapper.
-        msco.intListProperty.length = maxIndex;
-        if (msco.intListProperty.length != expectedLength)
-            success = false;
-        if (!verifyExpected(msco.intListProperty, 4))
-            success = false;
-        msco.intListProperty[maxIndex] = 15;
-        if (msco.intListProperty.length != expectedLength)
-            success = false;
-        if (!verifyExpected(msco.intListProperty, 4))
-            success = false;
     }
 }
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index f8b268199d..4389fe5cb7 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -4655,13 +4655,9 @@ void tst_qqmlecmascript::sequenceConversionIndexes()
     QString w1 = qmlFile.toString() + QLatin1String(":34: Index out of range during length set");
     QString w2 = qmlFile.toString() + QLatin1String(":41: Index out of range during indexed set");
     QString w3 = qmlFile.toString() + QLatin1String(":48: Index out of range during indexed get");
-    QString w4 = qmlFile.toString() + QLatin1String(":78: std::bad_alloc during length set");
-    QString w5 = qmlFile.toString() + QLatin1String(":83: std::bad_alloc during indexed set");
     QTest::ignoreMessage(QtWarningMsg, qPrintable(w1));
     QTest::ignoreMessage(QtWarningMsg, qPrintable(w2));
     QTest::ignoreMessage(QtWarningMsg, qPrintable(w3));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(w4));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(w5));
     QMetaObject::invokeMethod(object, "indexedAccess");
     QVERIFY(object->property("success").toBool());
     delete object;