summaryrefslogtreecommitdiff
path: root/src/websockets/doc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-02-20 15:38:55 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-02-20 15:38:55 +0100
commitb797778da01f72e64cda8680f29f3fa8434ffb0a (patch)
treea917f080b40188e8f937a50b29e47898e9709a51 /src/websockets/doc
parenta834ce5889dc3a79eebe1ac0a1576603b68f5a4b (diff)
parent85a8ea105646c7d871f982b890ef5f6faa91824d (diff)
downloadqtwebsockets-b797778da01f72e64cda8680f29f3fa8434ffb0a.tar.gz
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I96657102802860c8490c162462324e661592d879
Diffstat (limited to 'src/websockets/doc')
-rw-r--r--src/websockets/doc/qtwebsockets.qdocconf6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/websockets/doc/qtwebsockets.qdocconf b/src/websockets/doc/qtwebsockets.qdocconf
index 3f87cef..2e1e15b 100644
--- a/src/websockets/doc/qtwebsockets.qdocconf
+++ b/src/websockets/doc/qtwebsockets.qdocconf
@@ -37,7 +37,7 @@ qhp.QtWebSockets.subprojects.examples.sortPages = true
tagfile = ../../../doc/qtwebsockets/qtwebsockets.tags
-depends += qtcore qtnetwork qtdoc
+depends += qtcore qtnetwork qtdoc qmake
headerdirs += .. \
../../imports
@@ -50,6 +50,10 @@ sourcedirs += .. \
exampledirs += ../../../examples/websockets \
snippets
+examples.fileextensions += "*.html"
+
+imagedirs += ../../../examples/websockets/doc/images
+
manifestmeta.thumbnail.names += "QtWebSockets/*"
navigation.landingpage = "Qt WebSockets"