Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	.qmake.conf

Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736

2 files changed, 3 insertions, 1 deletions

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)
     {
     }
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 7f4ed88e..c206a021 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;