Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3

Change-Id: Ice7d2ed56c85521a946b218d84087b255d3613ae

1 files changed, 16 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp
index 3edbce9d..fd9d2cf0 100644
--- a/src/quicktemplates2/qquickpane.cpp
+++ b/src/quicktemplates2/qquickpane.cpp
@@ -103,6 +103,22 @@ QT_BEGIN_NAMESPACE
      }
     \endcode
 
+    If the \l contentItem has no implicit size and only one child, Pane will
+    use the implicit size of that child. For example, in the following code,
+    the Pane will assume the size of the Rectangle:
+
+    \code
+    Pane {
+        Item {
+            Rectangle {
+                implicitWidth: 200
+                implicitHeight: 200
+                color: "salmon"
+            }
+        }
+    }
+    \endcode
+
     \sa {Customizing Pane}, {Container Controls},
         {Focus Management in Qt Quick Controls 2}, {Event Handling}
 */