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>
---
 src/declarative/qml/qdeclarativeengine.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 52e5074bf0..8885f40fea 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -2145,6 +2145,8 @@ QVariant QDeclarativeEnginePrivate::scriptValueToVariant(const QScriptValue &val
 
     if (val.isArray()) {
         int length = val.property(QLatin1String("length")).toInt32();
+        if (!length)
+            containsQObjects = true;
         for (int ii = 0; ii < length; ++ii) {
             if (val.property(ii).isQObject()) {
                 containsQObjects = true;
-- 
cgit v1.2.3