Compute implicitSize based on implicitContentSize in Container and subclasses

Now that Container reflects its explicitly set contentWidth/Height through
implicitContentWidth/Height we can use the same expression for implicit
width/height as regular controls, which hooks us into the safe area
binding loop detection as well.

Pick-to: 6.9
Change-Id: If0a710a5eb4a35c91d02d7170b5e03e457e6bc12
Reviewed-by: Oliver Eftevaag <[email protected]>
Reviewed-by: Richard Moe Gustavsen <[email protected]>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quickcontrols/basic/Container.qml b/src/quickcontrols/basic/Container.qml
index 28e50279f0..c9002387a8 100644
--- a/src/quickcontrols/basic/Container.qml
+++ b/src/quickcontrols/basic/Container.qml
@@ -8,7 +8,7 @@ T.Container {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 }