summaryrefslogtreecommitdiff
path: root/src/controls/Private
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:32:42 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:32:42 +0100
commit44b8cbe43ca246ee52327dac19c44d358f233e66 (patch)
tree5b675c763e4b2e358809e133495cab9fa925a85f /src/controls/Private
parent6e96c1d6ea3c101f418c3ec95d49999f836ef60c (diff)
parent8c10fbf9c7907171b4bb1c2b72d17e90a0e59981 (diff)
downloadqtquickcontrols-44b8cbe43ca246ee52327dac19c44d358f233e66.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieeccd9670bca7dd354ae78de49b5e179973a9d4c
Diffstat (limited to 'src/controls/Private')
0 files changed, 0 insertions, 0 deletions