diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:58:13 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:58:13 +0200 |
commit | 2d29a774dd165ee2acd0b607b7e0d02a37c5fea5 (patch) | |
tree | be24afec9f39c584abff83888e842c25abbbddbb /tests/auto/qml/testtransport.h | |
parent | d342edcc22d3c9c0299e86805d93e7031507345b (diff) | |
parent | 7cb2d467c3421eced44ae7b887b8738cc68595fc (diff) | |
download | qtwebchannel-2d29a774dd165ee2acd0b607b7e0d02a37c5fea5.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib8b5300d27583018bc7582be41140dfda0ab5309
Diffstat (limited to 'tests/auto/qml/testtransport.h')
0 files changed, 0 insertions, 0 deletions