diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:35:36 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:35:36 +0100 |
| commit | acf13ece3d41c7a7188b6e44d17106dfefafa3d8 (patch) | |
| tree | e236975992f8ca65cc30e881598beeef5c706174 /src/declarative | |
| parent | 43ba79acb9ca4080b950c3273f2e237593c80172 (diff) | |
| parent | bc0cbee60cc309bef5e5359254f798942f676928 (diff) | |
Merge remote-tracking branch 'origin/5.4.1' into 5.4
Change-Id: I854c8bff922c0ffcaf2ea6daec00c12e9bed540e
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 682c8267..14f3c95c 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -2125,6 +2125,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; |