summaryrefslogtreecommitdiff
path: root/tests/auto/qml
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-24 19:37:29 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-24 19:37:29 +0100
commitc3787add37a77efe18e78549e51ff904f07a75f0 (patch)
tree2ba755951580d30f4f92a02350def74c93b31554 /tests/auto/qml
parent546cb80c0237e7dad42ec8ea21c21528bbabe41c (diff)
parent9cd01a4efb45e244d7b541e870be01c8d045a8ae (diff)
downloadqtwebchannel-c3787add37a77efe18e78549e51ff904f07a75f0.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Change-Id: I773dacf2a5513327db8be0837e7514685cbd1dc4
Diffstat (limited to 'tests/auto/qml')
0 files changed, 0 insertions, 0 deletions