From 6f55f3dbbb2cdae33a8b0d00b7bf2ada7fe79a04 Mon Sep 17 00:00:00 2001
From: Robert Griebl <robert.griebl@pelagicore.com>
Date: Thu, 8 Jan 2015 16:33:34 +0100
Subject: Fix empty arrays in QML 1

Commit bb0239e added a regression, where empty arrays would produce errors
in QML 1.

Task-number: QTBUG-43656
Change-Id: I6d416b2387a1dfd3588c000368fc1223d08399bd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 .../qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp           | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tests/auto')

diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index ac548b1e13..2ad3c669db 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -457,6 +457,12 @@ void tst_qdeclarativeecmascript::arrayExpressions()
     QCOMPARE(list2.at(1), QVariant(2));
     QCOMPARE(list2.at(2), QVariant(QString("foo")));
     QCOMPARE(list2.at(3), QVariant(QString("bar")));
+
+    MyExpression expr3(&context, "[]");
+    result = expr3.evaluate();
+    QCOMPARE(result.userType(), qMetaTypeId<QList<QObject *> >());
+    QList<QObject *> list3 = qvariant_cast<QList<QObject *> >(result);
+    QCOMPARE(list3.count(), 0);
 }
 
 // Tests that modifying a context property will reevaluate expressions
-- 
cgit v1.2.3