diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
| commit | 284057d12fea9339744ddc646aa53cfe6c3c95a1 (patch) | |
| tree | 61bb12637c56a282830d683e346057b00d332b7a /src/imports/controls/material/ToolSeparator.qml | |
| parent | 91b2721fdc2aba28d3c45111779fed70f7c4f87d (diff) | |
| parent | c8e9b5f25fb12c3b7983658d738165181b4d6672 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RoundButton.qml
src/imports/controls/universal/RadioDelegate.qml
Change-Id: I4cb14c19bd5f6e19b70b03fb394c76712e6dda08
Diffstat (limited to 'src/imports/controls/material/ToolSeparator.qml')
| -rw-r--r-- | src/imports/controls/material/ToolSeparator.qml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/imports/controls/material/ToolSeparator.qml b/src/imports/controls/material/ToolSeparator.qml index bdb2bc55..f8a5d9bb 100644 --- a/src/imports/controls/material/ToolSeparator.qml +++ b/src/imports/controls/material/ToolSeparator.qml @@ -49,11 +49,9 @@ T.ToolSeparator { topPadding: vertical ? 5 : 12 bottomPadding: vertical ? 5 : 12 - //! [contentItem] contentItem: Rectangle { implicitWidth: vertical ? 1 : 38 implicitHeight: vertical ? 38 : 1 color: control.Material.hintTextColor } - //! [contentItem] } |