diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-12 08:18:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-12 09:12:57 +0100 |
| commit | 2c83f2bf3366466db4dc0e3bee89e877fefe0260 (patch) | |
| tree | 9c1f26ce26f80d2583803f471a9ff14dc8fb192c /src/imports/controls/material/TabButton.qml | |
| parent | 7c7be5195df2b26db58c4e730e304787d7980228 (diff) | |
| parent | 00292bca971fbe7023a28c3ccd10947a34ea88f8 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/templates/qquickabstractbutton.cpp
Change-Id: Icfd472451a150524dded704b4be5d286da21a6da
Diffstat (limited to 'src/imports/controls/material/TabButton.qml')
| -rw-r--r-- | src/imports/controls/material/TabButton.qml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index 5b7510b4..496513dd 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -47,7 +47,7 @@ T.TabButton { contentItem.contentHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset - padding: 6 + padding: 12 //! [contentItem] contentItem: Text { @@ -62,8 +62,7 @@ T.TabButton { //! [background] background: Item { - height: parent.height - 1 - implicitHeight: 26 + implicitHeight: 48 } //! [background] } |