summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-29 10:10:22 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-29 10:10:22 +0200
commitf27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (patch)
treed84389d3c2a37b38435e0be5259f48e5f04290e0 /doc
parenta8c98dcb89f2b3f8438555d8febe17d3542d0567 (diff)
parent0d720a000f4f35c5ea6942426efec6847b06f4ce (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'doc')
-rw-r--r--doc/global/manifest-meta.qdocconf10
1 files changed, 3 insertions, 7 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf
index 1e7313711b..bb242eb98f 100644
--- a/doc/global/manifest-meta.qdocconf
+++ b/doc/global/manifest-meta.qdocconf
@@ -14,10 +14,9 @@
# Note: You cannot use operators (+, =, -) in the names.
#
# Examples: add a 'isHighlighted' attribute for two 'Analog Clock' examples,
-# add a 'database' tag for QtSql all examples, a 'webkit' tag for QtWebKit
-# examples, and a 'qt5' tag for all examples
+# add a 'database' tag for QtSql examples, and a 'qt5' tag for all examples
#
-# manifestmeta.filters = highlighted sql webkit global
+# manifestmeta.filters = highlighted sql global
#
# manifestmeta.highlighted.names = "QtGui/Analog Clock Window Example" \
# "QtWidgets/Analog Clock Example"
@@ -26,13 +25,10 @@
# manifestmeta.sql.names = "QtSql/*"
# manifestmeta.sql.tags = database
#
-# manifestmeta.webkit.names = "QtWebKitExamples/*"
-# manifestmeta.webkit.tags = webkit
-#
# manifestmeta.global.names = *
# manifestmeta.global.tags = qt5
-manifestmeta.filters = highlighted webkit1 webkit2 android thumbnail ios
+manifestmeta.filters = highlighted android thumbnail ios
manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \
"QtQuick/Qt Quick Demo - Photo Surface" \