aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-04-21 17:10:59 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-04-24 09:48:54 +0000
commit0e0f96303b4896b8e6a7e6575ca9e134e4dbd78b (patch)
treee500169fd2af380c1f8a02e065230735c069323c /src/imports/controls/material
parent46cd10b3a5be2557d40336ca5cc236690ce8398a (diff)
TabBar: remove hard-coded content heights
Since 24acfca, QQuickTabBar calculates the content height (the maximum height of the tab buttons). By removing the old hard-coded height, TabBar adjusts its height accordingly when using display:TextUnderIcon for TabButtons. Change-Id: Ib3520760fcfac46437169a1549efad166a27cffc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material')
-rw-r--r--src/imports/controls/material/TabBar.qml1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml
index 0bc62910..dcdda818 100644
--- a/src/imports/controls/material/TabBar.qml
+++ b/src/imports/controls/material/TabBar.qml
@@ -48,7 +48,6 @@ T.TabBar {
contentHeight + topPadding + bottomPadding)
spacing: 1
- contentHeight: 48
contentItem: ListView {
model: control.contentModel