diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-09 08:25:38 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-09 08:26:10 +0200 |
commit | 1db5df5a73d9cc7dfe24c07ea4f4d30ed377861b (patch) | |
tree | ff1d62ff1043a43484d6b069a7bbadfe26a5719f /examples | |
parent | cbfa64fd84cab95d909371a5e44146928e403c05 (diff) | |
parent | 38f7d855f2485cfb6a3a4328c1d31bac44ee0ae0 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ifff470774347041d1638fb1da277a8cc11a00db6
Diffstat (limited to 'examples')
-rw-r--r-- | examples/quickcontrols2/gallery/pages/FramePage.qml | 2 | ||||
-rw-r--r-- | examples/quickcontrols2/gallery/pages/GroupBoxPage.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/quickcontrols2/gallery/pages/FramePage.qml b/examples/quickcontrols2/gallery/pages/FramePage.qml index 51d49d22..579e7e2d 100644 --- a/examples/quickcontrols2/gallery/pages/FramePage.qml +++ b/examples/quickcontrols2/gallery/pages/FramePage.qml @@ -62,7 +62,7 @@ Pane { Column { spacing: 20 - width: itemWidth + width: pane.itemWidth RadioButton { text: "First" diff --git a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml index aea64a4f..52676721 100644 --- a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml +++ b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml @@ -63,7 +63,7 @@ Pane { Column { spacing: 20 - width: itemWidth + width: pane.itemWidth RadioButton { text: "First" |