summaryrefslogtreecommitdiff
path: root/src/controls/controls.pro
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-05 08:18:46 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-12-05 08:18:46 +0000
commitbb0ed6b2a9b763927022d41faf80ebcf745c0d01 (patch)
tree5bb22627915fee21fd1607937039cddad8c7f2d4 /src/controls/controls.pro
parent80ba7e03afe18cc44715f7cf9a038bedff01f328 (diff)
parentb573cc011b146461a8434fe817177ba979fb3a5f (diff)
downloadqtquickcontrols-bb0ed6b2a9b763927022d41faf80ebcf745c0d01.tar.gz
Merge "Merge remote-tracking branch 'origin/5.12.0' into 5.12" into refs/staging/5.12
Diffstat (limited to 'src/controls/controls.pro')
0 files changed, 0 insertions, 0 deletions