summaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols/controls/texteditor/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-27 16:38:57 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-28 10:01:14 +0200
commit54fe9544170f86ce50b366f1be1174e9d7cfe374 (patch)
tree49aada39e7932dcc12de32db69c94a92398d2ca4 /examples/quickcontrols/controls/texteditor/src
parent635af7d771d071c51b714b7aa183eca0d7066818 (diff)
parentb2bd108c44abb8a184aa6de7a937e9a3e2ad296a (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'examples/quickcontrols/controls/texteditor/src')
0 files changed, 0 insertions, 0 deletions