diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:38:57 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:38:57 +0200 |
| commit | b2bd108c44abb8a184aa6de7a937e9a3e2ad296a (patch) | |
| tree | 49aada39e7932dcc12de32db69c94a92398d2ca4 /examples/quickcontrols/controls/texteditor/src | |
| parent | 635af7d771d071c51b714b7aa183eca0d7066818 (diff) | |
| parent | 558eb844d59185d944c233348d2fef649e90b643 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I6c5ee0a59f5ba747611d8f6fdf97fdb7b88f97b9
Diffstat (limited to 'examples/quickcontrols/controls/texteditor/src')
0 files changed, 0 insertions, 0 deletions