diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-15 17:20:20 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-15 17:20:20 +0200 |
| commit | aa79d30b83fc79e8e18af4da0062ddf21fcd201f (patch) | |
| tree | f97fe44d83aa76a9c2629039aa44ebef82d5d91b /doc/qtdesignstudio/examples/coffeemachine/SideBar.qml | |
| parent | 765d3a6bc0343f3f26f9d2dbd65373b29f07177f (diff) | |
| parent | 7051ba84984b20676ef2de07349e56b0d7bdfa8c (diff) | |
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0
Change-Id: Ia70d4b47f578021f29197a22b3e07e792342d05c
Diffstat (limited to 'doc/qtdesignstudio/examples/coffeemachine/SideBar.qml')
0 files changed, 0 insertions, 0 deletions