6 files changed, 12 insertions, 12 deletions
diff --git a/src/quickcontrols/universal/Frame.qml b/src/quickcontrols/universal/Frame.qml
index 2e650d7913..357e33bdf5 100644
--- a/src/quickcontrols/universal/Frame.qml
+++ b/src/quickcontrols/universal/Frame.qml
@@ -9,9 +9,9 @@ T.Frame {
     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)
 
     padding: 12
 
diff --git a/src/quickcontrols/universal/GroupBox.qml b/src/quickcontrols/universal/GroupBox.qml
index b0b211bd95..29dd3e3de9 100644
--- a/src/quickcontrols/universal/GroupBox.qml
+++ b/src/quickcontrols/universal/GroupBox.qml
@@ -9,10 +9,10 @@ T.GroupBox {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding,
+                            implicitContentWidth + leftPadding + rightPadding,
                             implicitLabelWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     spacing: 12
     padding: 12
diff --git a/src/quickcontrols/universal/Page.qml b/src/quickcontrols/universal/Page.qml
index 7e2c69aa5b..dd1bdd8a6d 100644
--- a/src/quickcontrols/universal/Page.qml
+++ b/src/quickcontrols/universal/Page.qml
@@ -9,11 +9,11 @@ T.Page {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding,
+                            implicitContentWidth + leftPadding + rightPadding,
                             implicitHeaderWidth,
                             implicitFooterWidth)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding
+                             implicitContentHeight + topPadding + bottomPadding
                              + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0)
                              + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0))
 
diff --git a/src/quickcontrols/universal/Pane.qml b/src/quickcontrols/universal/Pane.qml
index 2f27979c4b..6c7d4b400c 100644
--- a/src/quickcontrols/universal/Pane.qml
+++ b/src/quickcontrols/universal/Pane.qml
@@ -9,9 +9,9 @@ T.Pane {
     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)
 
     padding: 12
 
diff --git a/src/quickcontrols/universal/ScrollView.qml b/src/quickcontrols/universal/ScrollView.qml
index 60789313c9..a465f97f63 100644
--- a/src/quickcontrols/universal/ScrollView.qml
+++ b/src/quickcontrols/universal/ScrollView.qml
@@ -9,9 +9,9 @@ T.ScrollView {
     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)
 
     ScrollBar.vertical: ScrollBar {
         parent: control
diff --git a/src/quickcontrols/universal/ToolBar.qml b/src/quickcontrols/universal/ToolBar.qml
index 33aa490c08..2870445be5 100644
--- a/src/quickcontrols/universal/ToolBar.qml
+++ b/src/quickcontrols/universal/ToolBar.qml
@@ -9,9 +9,9 @@ T.ToolBar {
     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)
 
     background: Rectangle {
         implicitHeight: 48 // AppBarThemeCompactHeight