qdoc: Handle future versions in \deprecated [<version>] command

The \deprecated command accepts a version string as a bracketed argument
representing the version in which the API element was deprecated.

Add a check for whether the argument represents a future version.
The version string is checked against the 'version' .qdocconf variable.
If it's deemed to be a future version, do not mark the Node instance
as deprecated; it will be kept as part of the API reference, instead
of moving it to the separate 'Deprecated members' page.

Tag such nodes with 'until <version>' both in the summary list and
detailed documentation (signature), and add an auto-generated
sentence into the documentation, for example;

  This function is scheduled for deprecation in version 6.9.

Use QVersionNumber for the version comparison. If QVersionNumber cannot
interpret both the 'version' configuration variable and the \deprecated
argument, mark the Node instance as deprecated.

[ChangeLog][QDoc] The \deprecated command now correctly handles
deprecations in a future version.

Fixes: QTBUG-121378
Change-Id: I094699257534902e45edf4fed55cf6ff06021f12
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

70 files changed, 161 insertions, 71 deletions

diff --git a/src/qdoc/qdoc/src/qdoc/codemarker.cpp b/src/qdoc/qdoc/src/qdoc/codemarker.cpp
index c673d0fce..28f84a946 100644
--- a/src/qdoc/qdoc/src/qdoc/codemarker.cpp
+++ b/src/qdoc/qdoc/src/qdoc/codemarker.cpp
@@ -138,9 +138,11 @@ QString CodeMarker::stringForNode(const Node *node)
     \list
         \li \c {"preliminary"}
         \li \c {"since <version_since>, deprecated in <version_deprecated>"}
+        \li \c {"since <version_since>, until <version_deprecated>"}
         \li \c {"since <version_since>"}
         \li \c {"since <version_since>, deprecated"}
         \li \c {"deprecated in <version_deprecated>"}
+        \li \c {"until <version_deprecated>"}
         \li \c {"deprecated"}
     \endlist
 
@@ -154,10 +156,14 @@ static std::optional<QString> nodeStatusAsString(const Node *node)
     QStringList result;
     if (const auto &since = node->since(); !since.isEmpty())
         result << "since %1"_L1.arg(since);
-    if (const auto &deprecated = node->deprecatedSince(); !deprecated.isEmpty())
-        result << "deprecated in %1"_L1.arg(deprecated);
-    else if (node->isDeprecated())
+    if (const auto &deprecated = node->deprecatedSince(); !deprecated.isEmpty()) {
+        if (node->isDeprecated())
+            result << "deprecated in %1"_L1.arg(deprecated);
+        else
+            result << "until %1"_L1.arg(deprecated);
+    } else if (node->isDeprecated()) {
         result << u"deprecated"_s;
+    }
 
     return result.isEmpty() ? std::nullopt : std::optional(result.join(u", "_s));
 }
diff --git a/src/qdoc/qdoc/src/qdoc/cppcodeparser.cpp b/src/qdoc/qdoc/src/qdoc/cppcodeparser.cpp
index 06491912b..019ec8215 100644
--- a/src/qdoc/qdoc/src/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/cppcodeparser.cpp
@@ -516,9 +516,7 @@ void CppCodeParser::processMetaCommand(const Doc &doc, const QString &command,
         if (node->isQmlType())
             node->setAbstract(true);
     } else if (command == COMMAND_DEPRECATED) {
-        node->setStatus(Node::Deprecated);
-        if (!argPair.second.isEmpty())
-            node->setDeprecatedSince(argPair.second);
+        node->setDeprecated(argPair.second);
     } else if (command == COMMAND_INGROUP || command == COMMAND_INPUBLICGROUP) {
         // Note: \ingroup and \inpublicgroup are the same (and now recognized as such).
         database->addToGroup(arg, node);
diff --git a/src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp b/src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp
index e628390b5..87d571098 100644
--- a/src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp
+++ b/src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp
@@ -2397,6 +2397,15 @@ bool DocBookGenerator::generateStatus(const Node *node)
                 return true;
             }
         }
+        if (const auto version = node->deprecatedSince(); !version.isEmpty()) {
+            m_writer->writeStartElement(dbNamespace, "para");
+            m_writer->writeCharacters("This " + typeString(node)
+                                      + " is scheduled for deprecation in version "
+                                      + version + ".");
+            m_writer->writeEndElement(); // para
+            newLine();
+            return true;
+        }
         return false;
     case Node::Preliminary:
         m_writer->writeStartElement(dbNamespace, "para");
diff --git a/src/qdoc/qdoc/src/qdoc/generator.cpp b/src/qdoc/qdoc/src/qdoc/generator.cpp
index 446ff0f83..c5e8a3652 100644
--- a/src/qdoc/qdoc/src/qdoc/generator.cpp
+++ b/src/qdoc/qdoc/src/qdoc/generator.cpp
@@ -1119,6 +1119,7 @@ QString Generator::formatSince(const Node *node)
       \li Custom status set explicitly in node's documentation using
           \c {\meta {status} {<description>}},
       \li 'Deprecated [since <version>]' (\\deprecated [<version>]),
+      \li 'Until <version>',
       \li 'Preliminary' (\\preliminary), or
       \li The description adopted from associated module's state:
           \c {\modulestate {<description>}}.
@@ -1135,10 +1136,13 @@ std::optional<QString> formatStatus(const Node *node, QDocDatabase *qdb)
         if (!status.isEmpty())
             return {status};
     }
+    const auto since = node->deprecatedSince();
     if (node->status() == Node::Deprecated) {
         status = u"Deprecated"_s;
-        if (const auto since = node->deprecatedSince(); !since.isEmpty())
+        if (!since.isEmpty())
             status += " since %1"_L1.arg(since);
+    } else if (!since.isEmpty()) {
+        status = "Until %1"_L1.arg(since);
     } else if (node->status() == Node::Preliminary) {
         status = u"Preliminary"_s;
     } else if (const auto collection = qdb->getModuleNode(node); collection) {
@@ -1197,8 +1201,14 @@ void Generator::generateStatus(const Node *node, CodeMarker *marker)
                      << Atom(Atom::FormattingLeft, ATOM_FORMATTING_ITALIC) << state
                      << Atom(Atom::FormattingRight, ATOM_FORMATTING_ITALIC) << " state."
                      << Atom::ParaRight;
+                break;
             }
         }
+        if (const auto version = node->deprecatedSince(); !version.isEmpty()) {
+            text << Atom::ParaLeft << "This " << typeString(node)
+                 << " is scheduled for deprecation in version "
+                 << version << "." << Atom::ParaRight;
+        }
         break;
     case Node::Preliminary:
         text << Atom::ParaLeft << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD) << "This "
diff --git a/src/qdoc/qdoc/src/qdoc/node.cpp b/src/qdoc/qdoc/src/qdoc/node.cpp
index 401ab1b0d..8246c0461 100644
--- a/src/qdoc/qdoc/src/qdoc/node.cpp
+++ b/src/qdoc/qdoc/src/qdoc/node.cpp
@@ -968,14 +968,39 @@ QString Node::fullDocumentName() const
     return pieces.join(concatenator);
 }
 
-void Node::setDeprecatedSince(const QString &sinceVersion)
+/*!
+    Sets the Node status to Node::Deprecated, unless \a sinceVersion represents
+    a future version.
+
+    Stores \a sinceVersion representing the version in which the deprecation
+    took (or will take) place.
+
+    Fetches the current version from the config ('version' variable) as a
+    string, and compared to \a sinceVersion. If both string represent a valid
+    version and \a sinceVersion is greater than the currect version, do not
+    mark the node as deprecated; leave it active.
+*/
+void Node::setDeprecated(const QString &sinceVersion)
 {
+
     if (!m_deprecatedSince.isEmpty())
         qCWarning(lcQdoc) << QStringLiteral(
                                      "Setting deprecated since version for %1 to %2 even though it "
                                      "was already set to %3. This is very unexpected.")
                                      .arg(this->m_name, sinceVersion, this->m_deprecatedSince);
     m_deprecatedSince = sinceVersion;
+
+    if (!sinceVersion.isEmpty()) {
+        QVersionNumber since = QVersionNumber::fromString(sinceVersion).normalized();
+        QVersionNumber current = QVersionNumber::fromString(
+                                    Config::instance().get(CONFIG_VERSION).asString())
+                                    .normalized();
+        if (!current.isNull() && !since.isNull()) {
+            if (current < since)
+                return;
+        }
+    }
+    setStatus(Deprecated);
 }
 
 /*! \fn Node *Node::clone(Aggregate *parent)
diff --git a/src/qdoc/qdoc/src/qdoc/node.h b/src/qdoc/qdoc/src/qdoc/node.h
index e29ac7823..4b227cad0 100644
--- a/src/qdoc/qdoc/src/qdoc/node.h
+++ b/src/qdoc/qdoc/src/qdoc/node.h
@@ -254,7 +254,7 @@ public:
     [[nodiscard]] virtual QString qtCMakeTargetItem() const { return QString(); }
     [[nodiscard]] virtual bool hasTag(const QString &) const { return false; }
 
-    void setDeprecatedSince(const QString &sinceVersion);
+    void setDeprecated(const QString &sinceVersion);
     [[nodiscard]] const QString &deprecatedSince() const { return m_deprecatedSince; }
 
     [[nodiscard]] const QMap<LinkType, std::pair<QString, QString>> &links() const { return m_linkMap; }
diff --git a/src/qdoc/qdoc/src/qdoc/qmlvisitor.cpp b/src/qdoc/qdoc/src/qdoc/qmlvisitor.cpp
index 61b176da4..54f00f7b8 100644
--- a/src/qdoc/qdoc/src/qdoc/qmlvisitor.cpp
+++ b/src/qdoc/qdoc/src/qdoc/qmlvisitor.cpp
@@ -403,9 +403,7 @@ void QmlDocVisitor::applyMetacommands(QQmlJS::SourceLocation, Node *node, Doc &d
                     node->setAbstract(true);
                 }
             } else if (command == COMMAND_DEPRECATED) {
-                node->setStatus(Node::Deprecated);
-                if (!args[0].second.isEmpty())
-                    node->setDeprecatedSince(args[0].second);
+                node->setDeprecated(args[0].second);
             } else if (command == COMMAND_INQMLMODULE) {
                 qdb->addToQmlModule(args[0].first, node);
             } else if (command == COMMAND_QMLINHERITS) {
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf
index fe63cc8ba..f71b50109 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf
@@ -58,7 +58,7 @@ manifestmeta.examplecategories = "Application Examples" \
                                  "Mobile" \
                                  "Embedded"
 tagfile = testtagfile.tags
-version = 0.0.1
+version = 6.2.11
 
 examplesinstallpath = test
 
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-qdoc-test-type.xml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-qdoc-test-type.xml
index f8f739bbc..176385ad8 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-qdoc-test-type.xml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-qdoc-test-type.xml
@@ -214,6 +214,12 @@
 <db:title>Type copy(<db:emphasis>a</db:emphasis>)</db:title>
 <db:para>Returns another Type based on <db:code its:translate="no" role="parameter">a</db:code>.</db:para>
 </db:section>
+<db:section xml:id="futureDeprecated-method">
+<db:title>[until 6.3] futureDeprecated()</db:title>
+<db:para>This method is scheduled for deprecation in version 6.3.</db:para>
+<db:para>Use something else instead.</db:para>
+<db:para>This is a method that's marked for deprecation in a future version.</db:para>
+</db:section>
 </db:section>
 <db:section xml:id="obsolete">
 <db:title>Obsolete Members for Type</db:title>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/autolinking.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/autolinking.html
index b0fa145a9..e486a78e1 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/autolinking.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/autolinking.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- classlists.qdoc -->
-  <title>Autolinking | Test 0.0.1</title>
+  <title>Autolinking | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar">
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/cpptypes.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/cpptypes.html
index f41e0cc68..3bd7789ff 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/cpptypes.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/cpptypes.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- classlists.qdoc -->
-  <title>Test C++ Types | Test 0.0.1</title>
+  <title>Test C++ Types | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/crossmoduleref.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/crossmoduleref.html
index d2676e049..f681dbd69 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/crossmoduleref.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/crossmoduleref.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- testcpp.cpp -->
   <meta name="description" content="Namespace that has documented functions in multiple modules.">
-  <title>CrossModuleRef Namespace | Test 0.0.1</title>
+  <title>CrossModuleRef Namespace | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar">
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/obsolete-classes.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/obsolete-classes.html
index fa5c5aae6..575b6e45c 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/obsolete-classes.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/obsolete-classes.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- classlists.qdoc -->
-  <title>Obsolete Classes | Test 0.0.1</title>
+  <title>Obsolete Classes | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar">
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qdoc-test-qmlmodule.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qdoc-test-qmlmodule.html
index 3fdab6150..6be64618b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qdoc-test-qmlmodule.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qdoc-test-qmlmodule.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- type.cpp -->
   <meta name="description" content="QML Types for the Test module.">
-  <title>QDoc.Test QML Module | Test 0.0.1</title>
+  <title>QDoc.Test QML Module | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-int.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-int.html
index bff6973c3..63ea49e7d 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-int.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-int.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- parent.qdoc -->
   <meta name="description" content="An integer value type.">
-  <title>int QML Value Type | Test 0.0.1</title>
+  <title>int QML Value Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-abstractparent-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-abstractparent-members.html
index ee9e4e9cc..af49329a3 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-abstractparent-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-abstractparent-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- parent.qdoc -->
   <meta name="description" content="Abstract base QML type.">
-  <title>List of All Members for AbstractParent | Test 0.0.1</title>
+  <title>List of All Members for AbstractParent | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-abstractparent.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-abstractparent.html
index 50cbf5f65..8fe88bee7 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-abstractparent.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-abstractparent.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- parent.qdoc -->
   <meta name="description" content="Abstract base QML type.">
-  <title>AbstractParent QML Type | Test 0.0.1</title>
+  <title>AbstractParent QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-child-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-child-members.html
index 82071911d..c9a9b0a5c 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-child-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-child-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- parent.qdoc -->
   <meta name="description" content="A Child inheriting its parent.">
-  <title>List of All Members for Child | Test 0.0.1</title>
+  <title>List of All Members for Child | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-child.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-child.html
index bf4f1a794..578c2f829 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-child.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-child.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- parent.qdoc -->
   <meta name="description" content="A Child inheriting its parent.">
-  <title>Child QML Type | Test 0.0.1</title>
+  <title>Child QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-doctest-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-doctest-members.html
index 60af5fb0f..706b65b20 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-doctest-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-doctest-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- DocTest.qml -->
   <meta name="description" content="Represents a doc test case.">
-  <title>List of All Members for DocTest | Test 0.0.1</title>
+  <title>List of All Members for DocTest | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-doctest.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-doctest.html
index d8b324e1e..37174fb59 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-doctest.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-doctest.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- DocTest.qml -->
   <meta name="description" content="Represents a doc test case.">
-  <title>DocTest QML Type | Test 0.0.1</title>
+  <title>DocTest QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-oldtype-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-oldtype-members.html
index 624f3fe07..6527f5a6c 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-oldtype-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-oldtype-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- type.cpp -->
   <meta name="description" content="Deprecated old type.">
-  <title>List of All Members for OldType | Test 0.0.1</title>
+  <title>List of All Members for OldType | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-oldtype.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-oldtype.html
index c8de61d18..4fe99b259 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-oldtype.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-oldtype.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- type.cpp -->
   <meta name="description" content="Deprecated old type.">
-  <title>OldType QML Type | Test 0.0.1</title>
+  <title>OldType QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type-members.html
index d3496ea5a..eb3180a88 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- type.cpp -->
   <meta name="description" content="A QML type documented in a .cpp file.">
-  <title>List of All Members for Type | Test 0.0.1</title>
+  <title>List of All Members for Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
@@ -30,6 +30,7 @@
 <li class="fn" translate="no"><b><a href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method" translate="no">deprecatedMethod</a></b>() <code class="summary extra" translate="no">(deprecated in 6.2)</code></li>
 <li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#disable-method" translate="no">disable</a></b>()</li>
 <li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#enable-method" translate="no">enable</a></b>()</li>
+<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#futureDeprecated-method" translate="no">futureDeprecated</a></b>() <code class="summary extra" translate="no">(until 6.3)</code></li>
 <li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.created-signal" translate="no">group.created</a></b>()</li>
 </ul>
 </body>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type-obsolete.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type-obsolete.html
index 7026a0d32..acd56759a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type-obsolete.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type-obsolete.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- type.cpp -->
   <meta name="description" content="A QML type documented in a .cpp file.">
-  <title>Obsolete Members for Type | Test 0.0.1</title>
+  <title>Obsolete Members for Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type.html
index 110bef4ea..807a0e07a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-type.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- type.cpp -->
   <meta name="description" content="A QML type documented in a .cpp file.">
-  <title>Type QML Type | Test 0.0.1</title>
+  <title>Type QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
@@ -62,6 +62,7 @@
 <li class="fn" translate="no">Type <b><a href="qml-qdoc-test-type.html#copy-method" translate="no">copy</a></b>(<i>a</i>)</li>
 <li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#disable-method" translate="no">disable</a></b>()</li>
 <li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#enable-method" translate="no">enable</a></b>()</li>
+<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#futureDeprecated-method" translate="no">futureDeprecated</a></b>() <code class="summary extra" translate="no">(until 6.3)</code></li>
 </ul>
 <!-- $$$Type-description -->
 <h2 id="details">Detailed Description</h2>
@@ -192,5 +193,17 @@
 <div class="qmldoc"><p>Returns another Type based on <i translate="no">a</i>.</p>
 </div></div><!-- @@@copy -->
 <br/>
+<!-- $$$futureDeprecated[overload1]$$$futureDeprecated -->
+<div class="qmlitem"><div class="qmlproto" translate="no">
+<div class="table"><table class="qmlname">
+<tr valign="top" class="odd" id="futureDeprecated-method">
+<td class="tblQmlFuncNode"><p>
+<code class="details extra" translate="no">[until 6.3]</code> <span class="name">futureDeprecated</span>()</p></td></tr>
+</table></div></div>
+<div class="qmldoc"><p>This method is scheduled for deprecation in version 6.3.</p>
+<p>Use something else instead.</p>
+<p>This is a method that's marked for deprecation in a future version.</p>
+</div></div><!-- @@@futureDeprecated -->
+<br/>
 </body>
 </html>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-yetanotherchild-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-yetanotherchild-members.html
index d2de3bdf8..fbab41876 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-yetanotherchild-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-yetanotherchild-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- parent.qdoc -->
   <meta name="description" content="A type inheriting from internal abstract parent.">
-  <title>List of All Members for YetAnotherChild | Test 0.0.1</title>
+  <title>List of All Members for YetAnotherChild | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-yetanotherchild.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-yetanotherchild.html
index aebe3e015..2ecc87355 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-yetanotherchild.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-qdoc-test-yetanotherchild.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- parent.qdoc -->
   <meta name="description" content="A type inheriting from internal abstract parent.">
-  <title>YetAnotherChild QML Type | Test 0.0.1</title>
+  <title>YetAnotherChild QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-doctest-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-doctest-members.html
index dd73ad26d..491427692 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-doctest-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-doctest-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- DocTest.qml -->
   <meta name="description" content="Shadows the type name in QDoc.Test module.">
-  <title>List of All Members for DocTest | Test 0.0.1</title>
+  <title>List of All Members for DocTest | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-doctest.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-doctest.html
index 88a22d0c0..2543b3ce3 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-doctest.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-doctest.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- DocTest.qml -->
   <meta name="description" content="Shadows the type name in QDoc.Test module.">
-  <title>DocTest QML Type | Test 0.0.1</title>
+  <title>DocTest QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion-members.html
index 4033d11b9..ca2308045 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- type.cpp -->
   <meta name="description" content="Another QML type documented in a .cpp file.">
-  <title>List of All Members for TypeNoVersion | Test 0.0.1</title>
+  <title>List of All Members for TypeNoVersion | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion.html
index be852226b..bf14e2e67 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- type.cpp -->
   <meta name="description" content="Another QML type documented in a .cpp file.">
-  <title>TypeNoVersion QML Type | Test 0.0.1</title>
+  <title>TypeNoVersion QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar-members.html
index b47103d77..77c4ef164 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- ProgressBar.qml -->
   <meta name="description" content="A component that shows the progress of an event.">
-  <title>List of All Members for ProgressBar | Test 0.0.1</title>
+  <title>List of All Members for ProgressBar | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar.html
index 1a4c66514..2db9f91d7 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- ProgressBar.qml -->
   <meta name="description" content="A component that shows the progress of an event.">
-  <title>ProgressBar QML Type | Test 0.0.1</title>
+  <title>ProgressBar QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch-members.html
index ceeb2648e..df1cd735f 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- Switch.qml -->
   <meta name="description" content="A component that can be turned on or off.">
-  <title>List of All Members for Switch | Test 0.0.1</title>
+  <title>List of All Members for Switch | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch.html
index fa50b0940..600c6c164 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- Switch.qml -->
   <meta name="description" content="A component that can be turned on or off.">
-  <title>Switch QML Type | Test 0.0.1</title>
+  <title>Switch QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget-members.html
index 4bdb1d972..cd459ceff 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- TabWidget.qml -->
   <meta name="description" content="A widget that places its children as tabs.">
-  <title>List of All Members for TabWidget | Test 0.0.1</title>
+  <title>List of All Members for TabWidget | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget.html
index 2506fc53d..3a55163ff 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- TabWidget.qml -->
   <meta name="description" content="A widget that places its children as tabs.">
-  <title>TabWidget QML Type | Test 0.0.1</title>
+  <title>TabWidget QML Type | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qmlmodules.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qmlmodules.html
index 8ba0effa4..61d19a809 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qmlmodules.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qmlmodules.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- modules.qdoc -->
-  <title>QML Modules | Test 0.0.1</title>
+  <title>QML Modules | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar">
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-cmakelists-txt.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-cmakelists-txt.html
index 33712cc7e..8072df6db 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-cmakelists-txt.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-cmakelists-txt.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- cmaketest.qdoc -->
-  <title>CMake Example Project | Test 0.0.1</title>
+  <title>CMake Example Project | Test 6.2.11</title>
 </head>
 <body>
 <h1 class="title">CMake Example Project</h1>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-example.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-example.html
index aedd6955f..a9ebe9784 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-example.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-example.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- cmaketest.qdoc -->
-  <title>CMake Example Project | Test 0.0.1</title>
+  <title>CMake Example Project | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-main-cpp.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-main-cpp.html
index 2f50106d6..0acb90579 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-main-cpp.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-cmaketest-main-cpp.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- cmaketest.qdoc -->
-  <title>CMake Example Project | Test 0.0.1</title>
+  <title>CMake Example Project | Test 6.2.11</title>
 </head>
 <body>
 <h1 class="title">CMake Example Project</h1>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-componentset-pro.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-componentset-pro.html
index 752deb8fb..0589f516e 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-componentset-pro.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-componentset-pro.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- examples.qdoc -->
   <meta name="description" content="Example for documenting QML types.">
-  <title>QML Documentation Example | Test 0.0.1</title>
+  <title>QML Documentation Example | Test 6.2.11</title>
 </head>
 <body>
 <h1 class="title">QML Documentation Example</h1>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-componentset-qml.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-componentset-qml.html
index e0c3c53fd..8d50b2a3a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-componentset-qml.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-componentset-qml.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- examples.qdoc -->
   <meta name="description" content="Example for documenting QML types.">
-  <title>QML Documentation Example | Test 0.0.1</title>
+  <title>QML Documentation Example | Test 6.2.11</title>
 </head>
 <body>
 <h1 class="title">QML Documentation Example</h1>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-example.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-example.html
index cd976b943..8227ff937 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-example.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-example.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- examples.qdoc -->
   <meta name="description" content="Example for documenting QML types.">
-  <title>QML Documentation Example | Test 0.0.1</title>
+  <title>QML Documentation Example | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar">
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-progressbar-qml.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-progressbar-qml.html
index 35a64e0ac..41c9c506a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-progressbar-qml.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-progressbar-qml.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- examples.qdoc -->
   <meta name="description" content="Example for documenting QML types.">
-  <title>QML Documentation Example | Test 0.0.1</title>
+  <title>QML Documentation Example | Test 6.2.11</title>
 </head>
 <body>
 <h1 class="title">QML Documentation Example</h1>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-switch-qml.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-switch-qml.html
index 7c4c3e421..958f2f19b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-switch-qml.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-switch-qml.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- examples.qdoc -->
   <meta name="description" content="Example for documenting QML types.">
-  <title>QML Documentation Example | Test 0.0.1</title>
+  <title>QML Documentation Example | Test 6.2.11</title>
 </head>
 <body>
 <h1 class="title">QML Documentation Example</h1>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-tabwidget-qml.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-tabwidget-qml.html
index 5aaba8635..ea6116dca 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-tabwidget-qml.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-componentset-tabwidget-qml.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- examples.qdoc -->
   <meta name="description" content="Example for documenting QML types.">
-  <title>QML Documentation Example | Test 0.0.1</title>
+  <title>QML Documentation Example | Test 6.2.11</title>
 </head>
 <body>
 <h1 class="title">QML Documentation Example</h1>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-demo-cpp.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-demo-cpp.html
index cc5c3aa1e..6e1f68232 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-demo-cpp.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-demo-cpp.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- demo.qdoc -->
-  <title>Demo | Test 0.0.1</title>
+  <title>Demo | Test 6.2.11</title>
 </head>
 <body>
 <h1 class="title">Demo</h1>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-demo-pro.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-demo-pro.html
index 597b07e15..3d59c65b3 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-demo-pro.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-demo-pro.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- demo.qdoc -->
-  <title>Demo | Test 0.0.1</title>
+  <title>Demo | Test 6.2.11</title>
 </head>
 <body>
 <h1 class="title">Demo</h1>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-dontxclude-cmakelists-txt.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-dontxclude-cmakelists-txt.html
index 668800211..c654a3768 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-dontxclude-cmakelists-txt.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-dontxclude-cmakelists-txt.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- demo.qdoc -->
-  <title>Demo | Test 0.0.1</title>
+  <title>Demo | Test 6.2.11</title>
 </head>
 <body>
 <h1 class="title">Demo</h1>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-example.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-example.html
index d6231c3e0..8f7c9ace8 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-example.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-demo-example.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- demo.qdoc -->
-  <title>Demo | Test 0.0.1</title>
+  <title>Demo | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-hidden-example.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-hidden-example.html
index 037d8c30f..fc123ba60 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-hidden-example.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-demos-hidden-example.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- hidden.qdoc -->
   <meta name="description" content="Tagged 'broken', does not appear in examples-manifest.xml.">
-  <title>Hidden Demo | Test 0.0.1</title>
+  <title>Hidden Demo | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-empty-qmlmodule.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-empty-qmlmodule.html
index 369d46ad4..eabda8b7a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-empty-qmlmodule.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-empty-qmlmodule.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- type.cpp -->
   <meta name="description" content="A QML module with no member types.">
-  <title>No QML Types Here | Test 0.0.1</title>
+  <title>No QML Types Here | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-nover-qmlmodule.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-nover-qmlmodule.html
index 4d0e97c1b..68cdf82d4 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-nover-qmlmodule.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test-nover-qmlmodule.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- type.cpp -->
   <meta name="description" content="QML Types for the Test module without version.">
-  <title>Versionless QML Module | Test 0.0.1</title>
+  <title>Versionless QML Module | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.index b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.index
index e317a6654..8089e4386 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.index
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.index
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QDOCINDEX>
-<INDEX url="" title="A test project for QDoc build artifacts" version="0.0.1" project="Test">
+<INDEX url="" title="A test project for QDoc build artifacts" version="6.2.11" project="Test">
     <namespace name="" status="active" access="public" module="test">
         <function name="QDOCTEST_MACRO" href="testqdoc.html#QDOCTEST_MACRO" status="active" access="public" documented="true" related="0" meta="macrowithoutparams" signature="QDOCTEST_MACRO"/>
         <function name="QDOCTEST_MACRO2" href="testqdoc-test.html#QDOCTEST_MACRO2" status="active" access="public" documented="true" related="1" since="Test 1.1" meta="macrowithparams" brief="A macro with argument x" signature="QDOCTEST_MACRO2(int &amp;x)" groups="testgroup">
@@ -161,6 +161,7 @@
             <function name="deprecatedMethod" fullname="QDoc.Test.Type.deprecatedMethod" href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method" status="deprecated" access="public" documented="true" meta="qmlmethod"/>
             <function name="disable" fullname="QDoc.Test.Type.disable" href="qml-qdoc-test-type.html#disable-method" status="active" access="public" documented="true" meta="qmlmethod"/>
             <function name="enable" fullname="QDoc.Test.Type.enable" href="qml-qdoc-test-type.html#enable-method" status="active" access="public" documented="true" meta="qmlmethod"/>
+            <function name="futureDeprecated" fullname="QDoc.Test.Type.futureDeprecated" href="qml-qdoc-test-type.html#futureDeprecated-method" status="active" access="public" documented="true" meta="qmlmethod"/>
             <function name="group.created" fullname="QDoc.Test.Type.group.created" href="qml-qdoc-test-type.html#group.created-signal" status="active" access="public" documented="true" meta="qmlsignal"/>
             <qmlproperty name="fifth" fullname="QDoc.Test.Type.fifth" href="qml-qdoc-test-type.html#fifth-prop" status="active" access="public" documented="true" type="int" attached="false" writable="true" brief="A group of properties sharing a documentation comment"/>
             <qmlproperty name="fourth" fullname="QDoc.Test.Type.fourth" href="qml-qdoc-test-type.html#fourth-prop" status="active" access="public" documented="true" type="int" attached="false" writable="true" brief="A group of properties sharing a documentation comment"/>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.qhp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.qhp
index 4b4663b69..663a01fd6 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.qhp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.qhp
@@ -2,7 +2,7 @@
 <QtHelpProject version="1.0">
     <namespace>org.qt-project.test.001</namespace>
     <virtualFolder>test</virtualFolder>
-    <metaData name="version" value="0.0.1"/>
+    <metaData name="version" value="6.2.11"/>
     <filterSection>
         <toc>
             <section ref="uicomponents-qmlmodule.html" title="UI Components">
@@ -127,6 +127,7 @@
             <keyword name="foo" id="DocTest::foo" ref="qml-qdoc-test-doctest.html#foo-signal"/>
             <keyword name="fourth" id="Type::fourth" ref="qml-qdoc-test-type.html#fourth-prop"/>
             <keyword name="funcPtr" id="Test::funcPtr" ref="testqdoc-test.html#funcPtr"/>
+            <keyword name="futureDeprecated" id="Type::futureDeprecated" ref="qml-qdoc-test-type.html#futureDeprecated-method"/>
             <keyword name="group.created" id="Type::group.created" ref="qml-qdoc-test-type.html#group.created-signal"/>
             <keyword name="group.first" id="Type::group.first" ref="qml-qdoc-test-type.html#group.first-prop"/>
             <keyword name="group.second" id="Type::group.second" ref="qml-qdoc-test-type.html#group.second-prop"/>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testcpp-module.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testcpp-module.html
index 7ce2f5e7c..f139d2ff8 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testcpp-module.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testcpp-module.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- testcpp.cpp -->
   <meta name="description" content="A test module page.">
-  <title>QDoc Test C++ Classes | Test 0.0.1</title>
+  <title>QDoc Test C++ Classes | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar">
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test-members.html
index c0e262852..3b34571c7 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- testcpp.cpp -->
   <meta name="description" content="A class in a namespace.">
-  <title>List of All Members for Test | Test 0.0.1</title>
+  <title>List of All Members for Test | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="testcpp-module.html" translate="no">C++ Classes</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test-obsolete.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test-obsolete.html
index 6d505e6a8..81cc19f7d 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test-obsolete.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test-obsolete.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- testcpp.cpp -->
   <meta name="description" content="A class in a namespace.">
-  <title>Obsolete Members for Test | Test 0.0.1</title>
+  <title>Obsolete Members for Test | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="testcpp-module.html" translate="no">C++ Classes</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test.html
index fe29c1ab5..088f92e41 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- testcpp.cpp -->
   <meta name="description" content="A class in a namespace.">
-  <title>Test Class | Test 0.0.1</title>
+  <title>Test Class | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="testcpp-module.html" translate="no">C++ Classes</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-members.html
index ee8cf56bd..4e0ef8264 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-members.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-members.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- testcpp.cpp -->
   <meta name="description" content="A class in a namespace, derived from Test.">
-  <title>List of All Members for TestDerived | Test 0.0.1</title>
+  <title>List of All Members for TestDerived | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="testcpp-module.html" translate="no">C++ Classes</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-obsolete.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-obsolete.html
index 6901bae62..e293b8595 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-obsolete.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-obsolete.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- testcpp.cpp -->
   <meta name="description" content="A class in a namespace, derived from Test.">
-  <title>Obsolete Members for TestDerived | Test 0.0.1</title>
+  <title>Obsolete Members for TestDerived | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="testcpp-module.html" translate="no">C++ Classes</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html
index d929acf3e..6710af3f5 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- testcpp.cpp -->
   <meta name="description" content="A class in a namespace, derived from Test.">
-  <title>TestDerived Class | Test 0.0.1</title>
+  <title>TestDerived Class | Test 6.2.11</title>
 </head>
 <body>
 <li><a href="testcpp-module.html" translate="no">C++ Classes</a></li>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc.html
index 2cb3ef004..aac36a819 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- testcpp.cpp -->
   <meta name="description" content="A namespace.">
-  <title>TestQDoc Namespace | Test 0.0.1</title>
+  <title>TestQDoc Namespace | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar">
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testtagfile.tags b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testtagfile.tags
index 11d9945a2..768e33e8a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testtagfile.tags
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testtagfile.tags
@@ -347,6 +347,13 @@
         </member>
         <member kind="function" protection="public" virtualness="non" static="no">
             <type></type>
+            <name>futureDeprecated</name>
+            <anchorfile>qml-qdoc-test-type.html</anchorfile>
+            <anchor>futureDeprecated-method</anchor>
+            <arglist>()</arglist>
+        </member>
+        <member kind="function" protection="public" virtualness="non" static="no">
+            <type></type>
             <name>group.created</name>
             <anchorfile>qml-qdoc-test-type.html</anchorfile>
             <anchor>group.created-signal</anchor>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/uicomponents-qmlmodule.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/uicomponents-qmlmodule.html
index 66b005ba8..0b7e08864 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/uicomponents-qmlmodule.html
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/uicomponents-qmlmodule.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
 <!-- examples.qdoc -->
   <meta name="description" content="Basic set of UI components.">
-  <title>UI Components | Test 0.0.1</title>
+  <title>UI Components | Test 6.2.11</title>
 </head>
 <body>
 <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/test.index b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/test.index
index bebea110f..bd39d404a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/test.index
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/test.index
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QDOCINDEX>
-<INDEX url="" title="A test project for QDoc build artifacts" version="0.0.1" project="Test">
+<INDEX url="" title="A test project for QDoc build artifacts" version="6.2.11" project="Test">
     <namespace name="" status="active" access="public" module="test">
         <function name="QDOCTEST_MACRO" href="testqdoc.html#QDOCTEST_MACRO" status="active" access="public" documented="true" related="0" meta="macrowithoutparams" signature="QDOCTEST_MACRO"/>
         <function name="QDOCTEST_MACRO2" href="testqdoc-test.html#QDOCTEST_MACRO2" status="active" access="public" documented="true" related="1" since="Test 1.1" meta="macrowithparams" brief="A macro with argument x" signature="QDOCTEST_MACRO2(int &amp;x)" groups="testgroup">
@@ -149,6 +149,7 @@
             <function name="deprecatedMethod" fullname="QDoc.Test.Type.deprecatedMethod" href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method" status="deprecated" access="public" documented="true" meta="qmlmethod"/>
             <function name="disable" fullname="QDoc.Test.Type.disable" href="qml-qdoc-test-type.html#disable-method" status="active" access="public" documented="true" meta="qmlmethod"/>
             <function name="enable" fullname="QDoc.Test.Type.enable" href="qml-qdoc-test-type.html#enable-method" status="active" access="public" documented="true" meta="qmlmethod"/>
+            <function name="futureDeprecated" fullname="QDoc.Test.Type.futureDeprecated" href="qml-qdoc-test-type.html#futureDeprecated-method" status="active" access="public" documented="true" meta="qmlmethod"/>
             <function name="group.created" fullname="QDoc.Test.Type.group.created" href="qml-qdoc-test-type.html#group.created-signal" status="active" access="public" documented="true" meta="qmlsignal"/>
             <qmlproperty name="fifth" fullname="QDoc.Test.Type.fifth" href="qml-qdoc-test-type.html#fifth-prop" status="active" access="public" documented="true" type="int" attached="false" writable="true" brief="A group of properties sharing a documentation comment"/>
             <qmlproperty name="fourth" fullname="QDoc.Test.Type.fourth" href="qml-qdoc-test-type.html#fourth-prop" status="active" access="public" documented="true" type="int" attached="false" writable="true" brief="A group of properties sharing a documentation comment"/>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testtagfile.tags b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testtagfile.tags
index 11d9945a2..768e33e8a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testtagfile.tags
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testtagfile.tags
@@ -347,6 +347,13 @@
         </member>
         <member kind="function" protection="public" virtualness="non" static="no">
             <type></type>
+            <name>futureDeprecated</name>
+            <anchorfile>qml-qdoc-test-type.html</anchorfile>
+            <anchor>futureDeprecated-method</anchor>
+            <arglist>()</arglist>
+        </member>
+        <member kind="function" protection="public" virtualness="non" static="no">
+            <type></type>
             <name>group.created</name>
             <anchorfile>qml-qdoc-test-type.html</anchorfile>
             <anchor>group.created-signal</anchor>
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/type.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/type.cpp
index 517932ae7..157bb807f 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/type.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/type.cpp
@@ -125,3 +125,10 @@
     This is a method that should include information about being deprecated
     and that it has been so since 6.2 in its docs.
 */
+
+/*!
+    \qmlmethod Type::futureDeprecated()
+    \deprecated [6.3] Use something else instead.
+
+    This is a method that's marked for deprecation in a future version.
+*/