diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:45:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:21:39 +0100 |
| commit | 61cb7ca7e8d8ebc5103870ae2795dbc65eb2c89f (patch) | |
| tree | dc28618df7f4ebfe398ec3a8597b61bbb492e42c /src/imports/controls | |
| parent | 82eee3b411f23eb01ab3658d77504970ddb151ef (diff) | |
| parent | 1d39e62ada99d85a411e1d6fc26925e342f5b59b (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/imports/controls/MenuItem.qml
Change-Id: Id4cae0e53a58796694ad1fc9f8380b317ee62984
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/MenuItem.qml | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index 751b33f6..8633c311 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -94,16 +94,13 @@ T.MenuItem { defaultColor: "#353637" } - background: Item { + background: Rectangle { implicitWidth: 200 implicitHeight: 40 - - Rectangle { - x: 1 - y: 1 - width: parent.width - 2 - height: parent.height - 2 - color: control.down ? control.palette.midlight : control.highlighted ? control.palette.light : "transparent" - } + x: 1 + y: 1 + width: parent.width - 2 + height: parent.height - 2 + color: control.down ? control.palette.midlight : control.highlighted ? control.palette.light : "transparent" } } |