summaryrefslogtreecommitdiff
path: root/src/webchannel/qwebchannel.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-05-24 20:02:27 +0200
committerLiang Qi <liang.qi@qt.io>2016-05-24 20:02:27 +0200
commit034d052823c5d1f36dd1378716c7757c1c0c78d0 (patch)
tree84b0edef2cd1e2fffe650c27f4bef9fe2ff29953 /src/webchannel/qwebchannel.cpp
parent9ea8ff6330b0e9259faf332de4af8bd0bfc3fcbf (diff)
parent4fda82b66e17cc03e6b08f1afd135069cfef09b7 (diff)
downloadqtwebchannel-034d052823c5d1f36dd1378716c7757c1c0c78d0.tar.gz
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ica9ff8d7142c5bd5328d44505beb8c22b4c21766
Diffstat (limited to 'src/webchannel/qwebchannel.cpp')
0 files changed, 0 insertions, 0 deletions