aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols/material
diff options
context:
space:
mode:
Diffstat (limited to 'src/quickcontrols/material')
-rw-r--r--src/quickcontrols/material/DialogButtonBox.qml4
-rw-r--r--src/quickcontrols/material/MenuBar.qml4
-rw-r--r--src/quickcontrols/material/SwipeView.qml4
-rw-r--r--src/quickcontrols/material/TabBar.qml4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/quickcontrols/material/DialogButtonBox.qml b/src/quickcontrols/material/DialogButtonBox.qml
index 55b2011c83..b2fc1bef36 100644
--- a/src/quickcontrols/material/DialogButtonBox.qml
+++ b/src/quickcontrols/material/DialogButtonBox.qml
@@ -11,9 +11,9 @@ T.DialogButtonBox {
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)
spacing: 8
padding: 8
diff --git a/src/quickcontrols/material/MenuBar.qml b/src/quickcontrols/material/MenuBar.qml
index c31b5b3158..6a3ec3a676 100644
--- a/src/quickcontrols/material/MenuBar.qml
+++ b/src/quickcontrols/material/MenuBar.qml
@@ -11,9 +11,9 @@ T.MenuBar {
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)
delegate: MenuBarItem { }
diff --git a/src/quickcontrols/material/SwipeView.qml b/src/quickcontrols/material/SwipeView.qml
index 72e63dd4d2..713d770bd2 100644
--- a/src/quickcontrols/material/SwipeView.qml
+++ b/src/quickcontrols/material/SwipeView.qml
@@ -9,9 +9,9 @@ T.SwipeView {
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)
contentItem: ListView {
model: control.contentModel
diff --git a/src/quickcontrols/material/TabBar.qml b/src/quickcontrols/material/TabBar.qml
index 5daffc9797..6e4ce4ef4d 100644
--- a/src/quickcontrols/material/TabBar.qml
+++ b/src/quickcontrols/material/TabBar.qml
@@ -10,9 +10,9 @@ T.TabBar {
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)
spacing: 1