diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-05-31 15:34:32 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-06-02 09:51:29 +0000 |
| commit | 18d8ca185819d6d81a9f21858ff2d60bf6fd05f8 (patch) | |
| tree | add5531b4e3cd6b77f8bfbc9c515268631336e9f /src/webchannel/doc/qtwebchannel.qdocconf | |
| parent | 4fda82b66e17cc03e6b08f1afd135069cfef09b7 (diff) | |
| download | qtwebchannel-18d8ca185819d6d81a9f21858ff2d60bf6fd05f8.tar.gz | |
Doc: Edit example documentation
- Add images to the examples.
- Add instructions for running the examples
- Edit for grammar and style
- Add dependencies to Qt WebEngine and Qt WebSockets modules
- Add a workaround for preventing autolinking of WebChannel,
WebEngine and WebSockets to the wrong targets
- Use explicit linking where necessary
Change-Id: Ia4025284063fa09c9e2a0b2c347ee682bba8a615
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
(cherry picked from commit 01ea92c7c8d77d3d3c10ab1cc4bf4f214aa07126)
Diffstat (limited to 'src/webchannel/doc/qtwebchannel.qdocconf')
| -rw-r--r-- | src/webchannel/doc/qtwebchannel.qdocconf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webchannel/doc/qtwebchannel.qdocconf b/src/webchannel/doc/qtwebchannel.qdocconf index cfb47e4..4026379 100644 --- a/src/webchannel/doc/qtwebchannel.qdocconf +++ b/src/webchannel/doc/qtwebchannel.qdocconf @@ -40,7 +40,7 @@ qhp.QtWebChannel.subprojects.javascript.indexTitle = Qt WebChannel JavaScript tagfile = ../../../doc/qtwebchannel/qtwebchannel.tags -depends += qtcore qtquick qtqml qmake qtdoc +depends += qtcore qtquick qtqml qmake qtdoc qtwebengine qtwebsockets headerdirs += .. \ ../../imports @@ -48,6 +48,7 @@ headerdirs += .. \ sourcedirs += .. \ ../../imports +imagedirs += images exampledirs += ../../../examples/webchannel examples.fileextensions += "*.html *.json" |