summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2022-04-25 11:49:22 +0200
committerTopi Reinio <topi.reinio@qt.io>2022-05-09 14:53:05 +0200
commitb03e0624bb6721c4d2f654311b45fbc9749f44c1 (patch)
tree6e0c6d58eb943dd6e6afe22e0a9e8b7deac49657
parent6c2665e4a298dcc6e387988b4ae6d455313436bc (diff)
downloadqtwebchannel-b03e0624bb6721c4d2f654311b45fbc9749f44c1.tar.gz
Enable documentation testing in CI
And fix issues with the documentation config; Replace obsolete selectors with up-to-date ones and add a dependency to qtcmake to make linking to CMake manual work. Pick-to: 6.3 Change-Id: I964fd21b252af4b9ae034de9be84fafc32b80646 Reviewed-by: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--coin/module_config.yaml1
-rw-r--r--src/webchannel/doc/qtwebchannel.qdocconf11
2 files changed, 8 insertions, 4 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 1e703d4..6e3b0d3 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -9,3 +9,4 @@ instructions:
- !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
Test:
- !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml"
+ - !include "{{qt/qtbase}}/coin_module_test_docs.yaml"
diff --git a/src/webchannel/doc/qtwebchannel.qdocconf b/src/webchannel/doc/qtwebchannel.qdocconf
index f2ae449..766e73f 100644
--- a/src/webchannel/doc/qtwebchannel.qdocconf
+++ b/src/webchannel/doc/qtwebchannel.qdocconf
@@ -19,17 +19,17 @@ qhp.QtWebChannel.subprojects = classes qml examples javas
qhp.QtWebChannel.subprojects.classes.title = C++ Classes
qhp.QtWebChannel.subprojects.classes.indexTitle = Qt WebChannel C++ Classes
-qhp.QtWebChannel.subprojects.classes.selectors = class fake:headerfile
+qhp.QtWebChannel.subprojects.classes.selectors = class headerfile
qhp.QtWebChannel.subprojects.classes.sortPages = true
qhp.QtWebChannel.subprojects.qml.title = QML Types
qhp.QtWebChannel.subprojects.qml.indexTitle = Qt WebChannel QML Types
-qhp.QtWebChannel.subprojects.qml.selectors = qmlclass
+qhp.QtWebChannel.subprojects.qml.selectors = qmltype
qhp.QtWebChannel.subprojects.qml.sortPages = true
qhp.QtWebChannel.subprojects.examples.title = Examples
qhp.QtWebChannel.subprojects.examples.indexTitle = Qt WebChannel Examples
-qhp.QtWebChannel.subprojects.examples.selectors = fake:example
+qhp.QtWebChannel.subprojects.examples.selectors = doc:example
qhp.QtWebChannel.subprojects.examples.sortPages = true
qhp.QtWebChannel.subprojects.javascript.title = JavaScript API
@@ -37,7 +37,7 @@ qhp.QtWebChannel.subprojects.javascript.indexTitle = Qt WebChannel JavaScript
tagfile = ../../../doc/qtwebchannel/qtwebchannel.tags
-depends += qtcore qtquick qtqml qmake qtdoc qtwebengine qtwebsockets
+depends += qtcore qtquick qtqml qtdoc qtwebengine qtwebsockets qmake qtcmake
headerdirs += .. \
../../imports
@@ -53,3 +53,6 @@ examples.fileextensions += "*.html *.json"
navigation.landingpage = "Qt WebChannel"
navigation.cppclassespage = "Qt WebChannel C++ Classes"
navigation.qmltypespage = "Qt WebChannel QML Types"
+
+# Enforce zero warnings for the documention build
+warninglimit = 0