summaryrefslogtreecommitdiff
path: root/src/controls/controls.pro
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:32:26 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:32:26 +0200
commit30c3d66fd5be3acc80e7ba1d2399c7a43624c3c8 (patch)
tree220d0201b5bf05180afb0f2f0115e95713e7207a /src/controls/controls.pro
parent0f74e642bf1f13f6b097b1a8e1412ca3cb6e85b5 (diff)
parent8105e3ed0e77f363ccc6406edd38082ac5cef27d (diff)
downloadqtquickcontrols-30c3d66fd5be3acc80e7ba1d2399c7a43624c3c8.tar.gz
Merge remote-tracking branch 'origin/5.12.4' into 5.12
Change-Id: I19610f79e1fd1f4b3033e6b11a3fef1f55c03a62
Diffstat (limited to 'src/controls/controls.pro')
0 files changed, 0 insertions, 0 deletions