diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-02 10:23:36 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-02 10:23:36 +0100 |
| commit | 715023b490f4cbae7d6b11356f7247979b01ad00 (patch) | |
| tree | f7851e0c366d0b1a43710be13ad2e8d5a4eb2525 /src/imports/controls/material/ToolBar.qml | |
| parent | 5be4488fb15b544926af203feeffa5ced8184f1f (diff) | |
| parent | 00a7dfd16d4484064bd0e5601720993d0525995a (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/platform/qquickplatformmenuitem.cpp
Change-Id: I4d399aa81a31112edf6030b52ba5d68828f9729d
Diffstat (limited to 'src/imports/controls/material/ToolBar.qml')
| -rw-r--r-- | src/imports/controls/material/ToolBar.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index 08670339..cb0a164f 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -52,6 +52,8 @@ T.ToolBar { Material.foreground: Material.toolTextColor + spacing: 16 + background: Rectangle { implicitHeight: 48 color: control.Material.toolBarColor |