diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:32:12 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:32:12 +0200 |
commit | fff4477661ae240c43088fa6d9069ccf969dbee8 (patch) | |
tree | d654a5f841cc6abe758c8626bbf51be6bdcdea26 /examples/quick/embeddedinwidgets | |
parent | 3a205800c6ea0a88ae2ab35edabf6883e54a334b (diff) | |
parent | 59e48836e207aff52b2727cc4f3733209475e8bb (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I081d9b15796b4133d2ba6f1a862f15b873a4846d
Diffstat (limited to 'examples/quick/embeddedinwidgets')
0 files changed, 0 insertions, 0 deletions