summaryrefslogtreecommitdiff
path: root/src/websockets/doc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-02-24 12:21:34 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-02-24 12:21:34 +0000
commitb01068a406f6ebf51e103dd541f36fd6ef144805 (patch)
tree9a1d2d634ce28672a72dfd1c7565f95cc82c2cb4 /src/websockets/doc
parent9989055693ac6225ae3e6f8153862765b0cd5e7e (diff)
parentb797778da01f72e64cda8680f29f3fa8434ffb0a (diff)
downloadqtwebsockets-b01068a406f6ebf51e103dd541f36fd6ef144805.tar.gz
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
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"