diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-20 16:27:47 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-21 16:44:49 +0200 |
| commit | 91ebebdbf26907c126dcc367832ed524d64b94cf (patch) | |
| tree | d9d4fee39a1fa88a2eb8ff90bcde6ec248550311 /examples/webchannel/chatclient-html/doc/images/chatclient-html.png | |
| parent | fa2374d7c4dedea907e2df26fdad28bdee73b122 (diff) | |
| parent | 3836fd7d12777fc53836a72d6542d2fbf2f20ac9 (diff) | |
| download | qtwebchannel-91ebebdbf26907c126dcc367832ed524d64b94cf.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/webchannel/doc/src/index.qdoc
src/webchannel/qwebchannelabstracttransport.cpp
Overlapping changes to documentation; constructed hybrid.
src/webchannel/qmetaobjectpublisher.cpp
tests/auto/webchannel/tst_webchannel.cpp
tests/auto/webchannel/tst_webchannel.h
Both sides made additions; in the same place.
Change-Id: Iff12970978b70946dc3e1290841aca2d35c9c1d0
Diffstat (limited to 'examples/webchannel/chatclient-html/doc/images/chatclient-html.png')
| -rw-r--r-- | examples/webchannel/chatclient-html/doc/images/chatclient-html.png | bin | 0 -> 7284 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/webchannel/chatclient-html/doc/images/chatclient-html.png b/examples/webchannel/chatclient-html/doc/images/chatclient-html.png Binary files differnew file mode 100644 index 0000000..f61c9ec --- /dev/null +++ b/examples/webchannel/chatclient-html/doc/images/chatclient-html.png |