summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/global/manifest-meta.qdocconf4
-rw-r--r--doc/global/qt-cpp-defines.qdocconf4
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf
index c45470838a..f535f5e290 100644
--- a/doc/global/manifest-meta.qdocconf
+++ b/doc/global/manifest-meta.qdocconf
@@ -55,9 +55,7 @@ manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \
"QtMultimedia/QML Video Shader Effects Example" \
"QtCanvas3D/Planets Example" \
"QtCanvas3D/Interactive Mobile Phone Example" \
- "QtLocation/Map Viewer (QML)" \
- "QtWebEngine/WebEngine Quick Nano Browser" \
- "QtWebEngine/Markdown Editor Example"
+ "QtLocation/Map Viewer (QML)"
manifestmeta.highlighted.attributes = isHighlighted:true
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index 967bbb8ede..54d2cbbe4e 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -161,3 +161,7 @@ Cpp.ignoredirectives += \
QT_WARNING_DISABLE_MSVC \
Q_ATTRIBUTE_FORMAT_PRINTF \
Q_MV_IOS
+
+# Qt 6: Remove
+falsehoods += \
+ "QT_VERSION >= QT_VERSION_CHECK\\(6,0,0\\)"