From 78b8a2bb464087ca083e3e9de3ec44a9a3413014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 24 Aug 2021 16:06:48 +0200 Subject: Doc: Remove mention of custom filters, part 2 Amends 235bbe3f939ce4b44b844ec67389c8a71ceceea5 Task-number: QTBUG-91082 Change-Id: Iade5289503d2c17e849eca1dfe2641aac70d8cfd Reviewed-by: Paul Wicking (cherry picked from commit fff99c6e97a094f2fed0a4fa56d3d74800e9c85c) Reviewed-by: Qt Cherry-pick Bot --- src/qdoc/doc/qdoc-manual-qdocconf.qdoc | 4 ---- src/qdoc/doc/qtgui-qdocconf.qdoc | 18 ------------------ 2 files changed, 22 deletions(-) diff --git a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc index eb2f8f5bf..7c747db8e 100644 --- a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc +++ b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc @@ -1449,10 +1449,6 @@ qhp.QtQuick.indexTitle = Qt Quick qhp.QtQuick.indexRoot = - qhp.QtQuick.filterAttributes = qtquick $QT_VERSION qtrefdoc - qhp.QtQuick.customFilters.Qt.name = QtQuick $QT_VERSION - qhp.QtQuick.customFilters.Qt.filterAttributes = qtquick $QT_VERSION - qhp.QtQuick.subprojects = qmltypes classes examples qhp.QtQuick.subprojects.qmltypes.title = QML Types diff --git a/src/qdoc/doc/qtgui-qdocconf.qdoc b/src/qdoc/doc/qtgui-qdocconf.qdoc index 89c46ff94..8602326bb 100644 --- a/src/qdoc/doc/qtgui-qdocconf.qdoc +++ b/src/qdoc/doc/qtgui-qdocconf.qdoc @@ -56,10 +56,6 @@ every statement in the qdocconf file. qhp.QtGui.indexTitle = Qt GUI qhp.QtGui.indexRoot = - qhp.QtGui.filterAttributes = qtgui $QT_VERSION qtrefdoc - qhp.QtGui.customFilters.Qt.name = Qtgui $QT_VERSION - qhp.QtGui.customFilters.Qt.filterAttributes = qtgui $QT_VERSION - qhp.QtGui.subprojects = classes qhp.QtGui.subprojects.classes.title = C++ Classes qhp.QtGui.subprojects.classes.indexTitle = Qt GUI C++ Classes @@ -198,20 +194,6 @@ This is the title of the page that has the contents. Specifies the title of the root (namespace) page to generate the documentation for. Typically defined as an empty string. -\badcode - qhp.QtGui.filterAttributes = qtgui $QT_VERSION qtrefdoc - qhp.QtGui.customFilters.Qt.name = QtGui $QT_VERSION - qhp.QtGui.customFilters.Qt.filterAttributes = qtgui $QT_VERSION -\endcode - -The documentation set (one per QDoc project) can have any number of filter -attributes assigned to it. A filter attribute is an ordinary string which -can be freely chosen. Additionally, custom filters that reference above -attributes can be defined. Qt Assistant will display the name of the custom -filter in its \gui{Filtered by} drop-down list. Only the documentation sets -that have their filter attributes match the attributes of the selected -custom filter will be shown. - \badcode qhp.QtGui.subprojects = classes qhp.QtGui.subprojects.classes.title = C++ Classes -- cgit v1.2.3