Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1

Change-Id: I75b0099b2b9ebb5cfb6f07b43b90b598743ae033

3 files changed, 4 insertions, 1 deletions

diff --git a/src/quick/doc/snippets/qml/texteditor.qml b/src/quick/doc/snippets/qml/texteditor.qml
index 7da9086e10..9bf13fb27c 100644
--- a/src/quick/doc/snippets/qml/texteditor.qml
+++ b/src/quick/doc/snippets/qml/texteditor.qml
@@ -63,7 +63,6 @@ Flickable {
      TextEdit {
          id: edit
          width: flick.width
-         height: flick.height
          focus: true
          wrapMode: TextEdit.Wrap
          onCursorRectangleChanged: flick.ensureVisible(cursorRectangle)
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index 9f27beb298..cd356a9eeb 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -852,6 +852,7 @@ qreal QQuickLoader::progress() const
 \qmlproperty bool QtQuick::Loader::asynchronous
 
 This property holds whether the component will be instantiated asynchronously.
+By default it is \c false.
 
 When used in conjunction with the \l source property, loading and compilation
 will also be performed in a background thread.
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index 264b30b897..22d57001fc 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -1079,6 +1079,7 @@ void QSGGeometryNode::setInheritedOpacity(qreal opacity)
 
 QSGClipNode::QSGClipNode()
     : QSGBasicGeometryNode(ClipNodeType)
+    , m_is_rectangular(false)
 {
     Q_UNUSED(m_reserved);
 }
@@ -1114,6 +1115,8 @@ QSGClipNode::~QSGClipNode()
 
     When this hint is set and it is applicable, the clip region will be
     generated from clipRect() rather than geometry().
+
+    By default this property is \c false.
  */
 
 void QSGClipNode::setIsRectangular(bool rectHint)