diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-10 14:23:53 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-10 14:24:28 +0100 |
| commit | 3f3e82fb05eb9eb9e03ccf8ed7de987b91e698ee (patch) | |
| tree | 484247f63e601abd8b012b86e6cde6ff56710cbb /examples/quickcontrols2/gallery/pages/GroupBoxPage.qml | |
| parent | c3ff6b78ba8e0978bc408f6e3e490bcd32f6cfb0 (diff) | |
| parent | 6cdd4b53031de17b36b30b00de0a6945470a35ad (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: Ifc09ea9f71fdba119fe8eed99f0bdcb402444f27
Diffstat (limited to 'examples/quickcontrols2/gallery/pages/GroupBoxPage.qml')
| -rw-r--r-- | examples/quickcontrols2/gallery/pages/GroupBoxPage.qml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml index 41f115a7..16f8762a 100644 --- a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml +++ b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml @@ -54,8 +54,6 @@ import QtQuick.Controls 2.12 ScrollablePage { id: page - readonly property string control : "groupbox" - readonly property int itemWidth: Math.max(button.implicitWidth, Math.min(button.implicitWidth * 3, page.availableWidth / 3 * 2)) Column { |