summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-09 13:47:55 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-09 13:47:55 +0200
commitb4ba5d36f46c61af4f8f6cdf07246fb5a63aedb5 (patch)
treecb6ec404b6e52a3cdf390e8f9f920ba4a27e6475 /src
parent0689a8256c0a21087c01fff3998fd3b606a5ac4c (diff)
parent88ff352d5145b5761179ee42164a0bfcd4f1d54a (diff)
downloadqtquickcontrols-b4ba5d36f46c61af4f8f6cdf07246fb5a63aedb5.tar.gz
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I7b811e7ce791f9b9a9d0e97bd2b23b22c959404d
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions