diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-27 18:47:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-27 18:47:51 +0100 |
| commit | 64cbf20ec8ce9ae21e67bd0b1c30b16d12582bc7 (patch) | |
| tree | 624a5a247e3b9497ed15ab5985b8cbd89e46980a /src/imports/controls/GroupBox.qml | |
| parent | cf0905a25cc02a1ad2a242319e7ad9748c0a64f3 (diff) | |
| parent | 3de42498fce9bacbdda71e4c8a9af494434e2993 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
tests/auto/controls/data/tst_dialogbuttonbox.qml
Change-Id: I39ea99d988aaa7d1afd35d573cca44d009b859ce
Diffstat (limited to 'src/imports/controls/GroupBox.qml')
0 files changed, 0 insertions, 0 deletions