summaryrefslogtreecommitdiffstats
path: root/qtquickcontrols2
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-05 22:50:14 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-05 22:58:09 +0100
commit89d4dec81886a5e2d1e7537195f8677146666c85 (patch)
tree2e2ce8ef360b8014ffa403e612d86df7b1cfedac /qtquickcontrols2
parentb9b259fd405be7f208851369d0be2f40f90662be (diff)
parenta742af96fb2b09870a02b0ef33bfed9949bc44ba (diff)
Merge remote-tracking branch 'origin/5.9.4' into 5.9
Conflicts: .gitmodules Change-Id: I6a2446b8ed4212e3965b37cb2c25f35ba6ed7efc
Diffstat (limited to 'qtquickcontrols2')
0 files changed, 0 insertions, 0 deletions