summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2021-08-24 16:06:48 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-25 07:15:12 +0000
commit78b8a2bb464087ca083e3e9de3ec44a9a3413014 (patch)
treef49f80a9671bd1d729deae550a24c8f9a986cd27
parentdb3facebdcc5cdcd1d39b1c544f85d30b6a26808 (diff)
Doc: Remove mention of custom filters, part 2
Amends 235bbe3f939ce4b44b844ec67389c8a71ceceea5 Task-number: QTBUG-91082 Change-Id: Iade5289503d2c17e849eca1dfe2641aac70d8cfd Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fff99c6e97a094f2fed0a4fa56d3d74800e9c85c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qdoc/doc/qdoc-manual-qdocconf.qdoc4
-rw-r--r--src/qdoc/doc/qtgui-qdocconf.qdoc18
2 files changed, 0 insertions, 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
@@ -199,20 +195,6 @@ Specifies the title of the root (namespace) page to generate the documentation f
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
qhp.QtGui.subprojects.classes.indexTitle = Qt GUI C++ Classes