From e9398ba4e7512ae53e617dcb3a3577c14b43fe7d Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Thu, 8 Jan 2015 15:48:28 +0100 Subject: Fix empty arrays in QML 1 Commit 9cbb6fa added a regression, where empty arrays would produce errors in QML 1. Change-Id: Ie5c784d5ec921d1ca69084750ed37fc2e273bbef Task-number: QTBUG-43656 Reviewed-by: Simon Hausmann --- src/declarative/qml/qdeclarativeengine.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/declarative') 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; -- cgit v1.2.3 From 1e3b91b5d95f43d88a6f188f52b7b46197854a07 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 2 Feb 2015 14:31:32 +0100 Subject: QDeclarativeTextEdit: fix use of uninitialised value. Detected by valgrind (in Qt 4.8.6): ==27068== Conditional jump or move depends on uninitialised value(s) ==27068== at 0x70C7289: QDeclarativeTextEdit::updateTotalLines() (qdeclarativetextedit.cpp:1742) Change-Id: I17856a6d5e06f10f2daf5f3534c175526f21b5dc Reviewed-by: Simon Hausmann --- src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/declarative') diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h index e9f2b17e..b334fae0 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h @@ -66,7 +66,7 @@ public: hAlignImplicit(true), rightToLeftText(false), selectByMouse(false), canPaste(false), canPasteValid(false), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0), cursorComponent(0), cursor(0), format(QDeclarativeTextEdit::AutoText), document(0), wrapMode(QDeclarativeTextEdit::NoWrap), - mouseSelectionMode(QDeclarativeTextEdit::SelectCharacters), + mouseSelectionMode(QDeclarativeTextEdit::SelectCharacters), lineCount(0), yoff(0) { } -- cgit v1.2.3