summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-12-08 12:59:32 (GMT)
committerLiang Qi <liang.qi@qt.io>2017-12-08 12:59:32 (GMT)
commit5e43b6364b6c0bbeb67772581e550fc3e64e9008 (patch)
treebc6a032702cc8de2c5fa84488f218950f6fb1eb9
parent07cbe31332c518993ad8fc5c519abf64a83d4ab9 (diff)
parentacb01cb27b6c4aead84435ec7115fecd2a8db336 (diff)
downloadqtwebchannel-5e43b6364b6c0bbeb67772581e550fc3e64e9008.tar.gz
Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I6b0be62459ae5450775415b4468135002cf47b47