diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 23:27:32 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 23:31:16 +0200 |
| commit | 9a9a9bd1144663e2cb74efdd3d3f6d76c72313f9 (patch) | |
| tree | 2811ccf99d641b040587716f17be8c59a30e11fe /src/imports/controls/material/ToolBar.qml | |
| parent | 320647bce7d968b5798dfc6946df555a548e3f8f (diff) | |
| parent | 86180aed5008779b1b94731d9b4c6b1fdac8f3d3 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: If097242bfffe435d3b379a73eb6c8f54bed8495b
Diffstat (limited to 'src/imports/controls/material/ToolBar.qml')
| -rw-r--r-- | src/imports/controls/material/ToolBar.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index ce4f64ec..0da814f1 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -56,7 +56,7 @@ T.ToolBar { background: Rectangle { implicitHeight: 48 - color: control.Material.primaryColor + color: control.Material.toolBarColor layer.enabled: control.Material.elevation > 0 layer.effect: ElevationEffect { |