qdoc: Do not print error for future functions

Some function declarations are marked as not existing until Qt 6.0
in both the .h and .cpp files, but they are documented in the .cpp
file. qdoc can't tie the documentation for these functions to their
declarations because of the way clang is used, and qdoc reports
that reports the documentation as an error.

This update let's qdoc ignore these functions and not print the error
when they are marked with \since 6.0. This will also work with other
future versions.

This update also collects all the uses of #define COMMAND_xxx in one
location, which was partially required by the \since 6.0 change.

Change-Id: I55052359f387406da340c748768f8e76c0b39d53
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

8 files changed, 112 insertions, 184 deletions

diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp
index acc3f2446..460c94365 100644
--- a/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/clangcodeparser.cpp
@@ -1010,6 +1010,7 @@ ClangCodeParser::~ClangCodeParser()
 void ClangCodeParser::initializeParser(const Config &config)
 {
     printParsingErrors_ = 1;
+    version_ = config.getString(CONFIG_VERSION);
     const auto args = config.getStringList(CONFIG_INCLUDEPATHS);
     includePaths_.resize(args.size());
     std::transform(args.begin(), args.end(), includePaths_.begin(),
@@ -1309,6 +1310,13 @@ void ClangCodeParser::precompileHeaders()
     clang_disposeIndex(index_);
 }
 
+static float getUnpatchedVersion(QString t)
+{
+    if (t.count(QChar('.')) > 1)
+        t.truncate(t.lastIndexOf(QChar('.')));
+    return t.toFloat();
+}
+
 /*!
   Get ready to parse the C++ cpp file identified by \a filePath
   and add its parsed contents to the database. \a location is
@@ -1390,12 +1398,20 @@ void ClangCodeParser::parseSourceFile(const Location& /*location*/, const QStrin
                 nodes.append(n);
                 docs.append(doc);
             } else if (CodeParser::isWorthWarningAbout(doc)) {
-                doc.location().warning(tr("Cannot tie this documentation to anything"),
-                                       tr("qdoc found a /*! ... */ comment, but there was no "
-                                       "topic command (e.g., '\\%1', '\\%2') in the "
-                                       "comment and no function definition following "
-                                       "the comment.")
-                                       .arg(COMMAND_FN).arg(COMMAND_PAGE));
+                bool future = false;
+                if (doc.metaCommandsUsed().contains(COMMAND_SINCE)) {
+                    QString sinceVersion = doc.metaCommandArgs(COMMAND_SINCE)[0].first;
+                    if (getUnpatchedVersion(sinceVersion) > getUnpatchedVersion(version_))
+                        future = true;
+                }
+                if (!future) {
+                    doc.location().warning(tr("Cannot tie this documentation to anything"),
+                                           tr("qdoc found a /*! ... */ comment, but there was no "
+                                              "topic command (e.g., '\\%1', '\\%2') in the "
+                                              "comment and no function definition following "
+                                              "the comment.")
+                                           .arg(COMMAND_FN).arg(COMMAND_PAGE));
+                }
             }
         } else {
             processTopicArgs(doc, topic, nodes, docs);
diff --git a/src/qdoc/clangcodeparser.h b/src/qdoc/clangcodeparser.h
index b3497608d..a8f00d1cc 100644
--- a/src/qdoc/clangcodeparser.h
+++ b/src/qdoc/clangcodeparser.h
@@ -70,6 +70,7 @@ public:
 
 private:
     int printParsingErrors_;
+    QString version_;
     QHash<QString, QString> allHeaders_; // file name->path
     QVector<QByteArray> includePaths_;
     QScopedPointer<QTemporaryDir> pchFileDir_;
diff --git a/src/qdoc/codeparser.cpp b/src/qdoc/codeparser.cpp
index 6a60e1e48..db82bf746 100644
--- a/src/qdoc/codeparser.cpp
+++ b/src/qdoc/codeparser.cpp
@@ -40,27 +40,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#define COMMAND_DEPRECATED              Doc::alias(QLatin1String("deprecated")) // ### don't document
-#define COMMAND_INGROUP                 Doc::alias(QLatin1String("ingroup"))
-#define COMMAND_INMODULE                Doc::alias(QLatin1String("inmodule"))  // ### don't document
-#define COMMAND_INQMLMODULE             Doc::alias(QLatin1String("inqmlmodule"))
-#define COMMAND_INJSMODULE              Doc::alias(QLatin1String("injsmodule"))
-#define COMMAND_INTERNAL                Doc::alias(QLatin1String("internal"))
-#define COMMAND_MAINCLASS               Doc::alias(QLatin1String("mainclass"))
-#define COMMAND_NONREENTRANT            Doc::alias(QLatin1String("nonreentrant"))
-#define COMMAND_OBSOLETE                Doc::alias(QLatin1String("obsolete"))
-#define COMMAND_PAGEKEYWORDS            Doc::alias(QLatin1String("pagekeywords"))
-#define COMMAND_PRELIMINARY             Doc::alias(QLatin1String("preliminary"))
-#define COMMAND_INPUBLICGROUP           Doc::alias(QLatin1String("inpublicgroup"))
-#define COMMAND_QTVARIABLE              Doc::alias(QLatin1String("qtvariable"))
-#define COMMAND_REENTRANT               Doc::alias(QLatin1String("reentrant"))
-#define COMMAND_SINCE                   Doc::alias(QLatin1String("since"))
-#define COMMAND_SUBTITLE                Doc::alias(QLatin1String("subtitle"))
-#define COMMAND_THREADSAFE              Doc::alias(QLatin1String("threadsafe"))
-#define COMMAND_TITLE                   Doc::alias(QLatin1String("title"))
-#define COMMAND_WRAPPER                 Doc::alias(QLatin1String("wrapper"))
-#define COMMAND_NOAUTOLIST              Doc::alias(QLatin1String("noautolist"))
-
 QList<CodeParser *> CodeParser::parsers;
 bool CodeParser::showInternal_ = false;
 bool CodeParser::singleExec_ = false;
diff --git a/src/qdoc/codeparser.h b/src/qdoc/codeparser.h
index 6659e3eed..4f41296f4 100644
--- a/src/qdoc/codeparser.h
+++ b/src/qdoc/codeparser.h
@@ -93,6 +93,95 @@ private:
     static bool singleExec_;
 };
 
+#define COMMAND_ABSTRACT                Doc::alias(QLatin1String("abstract"))
+#define COMMAND_AUDIENCE                Doc::alias(QLatin1String("audience"))
+#define COMMAND_AUTHOR                  Doc::alias(QLatin1String("author"))
+#define COMMAND_CATEGORY                Doc::alias(QLatin1String("category"))
+#define COMMAND_CLASS                   Doc::alias(QLatin1String("class"))
+#define COMMAND_COMPONENT               Doc::alias(QLatin1String("component"))
+#define COMMAND_CONTENTSPAGE            Doc::alias(QLatin1String("contentspage"))
+#define COMMAND_COPYRHOLDER             Doc::alias(QLatin1String("copyrholder"))
+#define COMMAND_COPYRYEAR               Doc::alias(QLatin1String("copyryear"))
+#define COMMAND_DEPRECATED              Doc::alias(QLatin1String("deprecated")) // ### don't document
+#define COMMAND_DITAMAP                 Doc::alias(QLatin1String("ditamap"))
+#define COMMAND_ENUM                    Doc::alias(QLatin1String("enum"))
+#define COMMAND_EXAMPLE                 Doc::alias(QLatin1String("example"))
+#define COMMAND_EXTERNALPAGE            Doc::alias(QLatin1String("externalpage"))
+#define COMMAND_FN                      Doc::alias(QLatin1String("fn"))
+#define COMMAND_GROUP                   Doc::alias(QLatin1String("group"))
+#define COMMAND_HEADERFILE              Doc::alias(QLatin1String("headerfile"))
+#define COMMAND_INDEXPAGE               Doc::alias(QLatin1String("indexpage"))
+#define COMMAND_INGROUP                 Doc::alias(QLatin1String("ingroup"))
+#define COMMAND_INHEADERFILE            Doc::alias(QLatin1String("inheaderfile"))
+#define COMMAND_INJSMODULE              Doc::alias(QLatin1String("injsmodule"))
+#define COMMAND_INMODULE                Doc::alias(QLatin1String("inmodule"))  // ### don't document
+#define COMMAND_INPUBLICGROUP           Doc::alias(QLatin1String("inpublicgroup"))
+#define COMMAND_INQMLMODULE             Doc::alias(QLatin1String("inqmlmodule"))
+#define COMMAND_INTERNAL                Doc::alias(QLatin1String("internal"))
+#define COMMAND_JSATTACHEDMETHOD        Doc::alias(QLatin1String("jsattachedmethod"))
+#define COMMAND_JSATTACHEDPROPERTY      Doc::alias(QLatin1String("jsattachedproperty"))
+#define COMMAND_JSATTACHEDSIGNAL        Doc::alias(QLatin1String("jsattachedsignal"))
+#define COMMAND_JSBASICTYPE             Doc::alias(QLatin1String("jsbasictype"))
+#define COMMAND_JSMETHOD                Doc::alias(QLatin1String("jsmethod"))
+#define COMMAND_JSMODULE                Doc::alias(QLatin1String("jsmodule"))
+#define COMMAND_JSPROPERTY              Doc::alias(QLatin1String("jsproperty"))
+#define COMMAND_JSPROPERTYGROUP         Doc::alias(QLatin1String("jspropertygroup"))
+#define COMMAND_JSSIGNAL                Doc::alias(QLatin1String("jssignal"))
+#define COMMAND_JSTYPE                  Doc::alias(QLatin1String("jstype"))
+#define COMMAND_LICENSEDESCRIPTION      Doc::alias(QLatin1String("licensedescription"))
+#define COMMAND_LICENSENAME             Doc::alias(QLatin1String("licensename"))
+#define COMMAND_LICENSEYEAR             Doc::alias(QLatin1String("licenseyear"))
+#define COMMAND_LIFECYCLEVERSION        Doc::alias(QLatin1String("lifecycleversion"))
+#define COMMAND_LIFECYCLEWSTATUS        Doc::alias(QLatin1String("lifecyclestatus"))
+#define COMMAND_MACRO                   Doc::alias(QLatin1String("macro"))
+#define COMMAND_MAINCLASS               Doc::alias(QLatin1String("mainclass"))
+#define COMMAND_MODULE                  Doc::alias(QLatin1String("module"))
+#define COMMAND_NAMESPACE               Doc::alias(QLatin1String("namespace"))
+#define COMMAND_NEXTPAGE                Doc::alias(QLatin1String("nextpage"))
+#define COMMAND_NOAUTOLIST              Doc::alias(QLatin1String("noautolist"))
+#define COMMAND_NONREENTRANT            Doc::alias(QLatin1String("nonreentrant"))
+#define COMMAND_OBSOLETE                Doc::alias(QLatin1String("obsolete"))
+#define COMMAND_OVERLOAD                Doc::alias(QLatin1String("overload"))
+#define COMMAND_PAGE                    Doc::alias(QLatin1String("page"))
+#define COMMAND_PAGEKEYWORDS            Doc::alias(QLatin1String("pagekeywords"))
+#define COMMAND_PERMISSIONS             Doc::alias(QLatin1String("permissions"))
+#define COMMAND_PRELIMINARY             Doc::alias(QLatin1String("preliminary"))
+#define COMMAND_PREVIOUSPAGE            Doc::alias(QLatin1String("previouspage"))
+#define COMMAND_PRODNAME                Doc::alias(QLatin1String("prodname"))
+#define COMMAND_PROPERTY                Doc::alias(QLatin1String("property"))
+#define COMMAND_PUBLISHER               Doc::alias(QLatin1String("publisher"))
+#define COMMAND_QMLABSTRACT             Doc::alias(QLatin1String("qmlabstract"))
+#define COMMAND_QMLATTACHEDMETHOD       Doc::alias(QLatin1String("qmlattachedmethod"))
+#define COMMAND_QMLATTACHEDPROPERTY     Doc::alias(QLatin1String("qmlattachedproperty"))
+#define COMMAND_QMLATTACHEDSIGNAL       Doc::alias(QLatin1String("qmlattachedsignal"))
+#define COMMAND_QMLBASICTYPE            Doc::alias(QLatin1String("qmlbasictype"))
+#define COMMAND_QMLCLASS                Doc::alias(QLatin1String("qmlclass"))
+#define COMMAND_QMLDEFAULT              Doc::alias(QLatin1String("default"))
+#define COMMAND_QMLINHERITS             Doc::alias(QLatin1String("inherits"))
+#define COMMAND_QMLINSTANTIATES         Doc::alias(QLatin1String("instantiates"))
+#define COMMAND_QMLMETHOD               Doc::alias(QLatin1String("qmlmethod"))
+#define COMMAND_QMLMODULE               Doc::alias(QLatin1String("qmlmodule"))
+#define COMMAND_QMLPROPERTY             Doc::alias(QLatin1String("qmlproperty"))
+#define COMMAND_QMLPROPERTYGROUP        Doc::alias(QLatin1String("qmlpropertygroup"))
+#define COMMAND_QMLREADONLY             Doc::alias(QLatin1String("readonly"))
+#define COMMAND_QMLSIGNAL               Doc::alias(QLatin1String("qmlsignal"))
+#define COMMAND_QMLTYPE                 Doc::alias(QLatin1String("qmltype"))
+#define COMMAND_QTVARIABLE              Doc::alias(QLatin1String("qtvariable"))
+#define COMMAND_REENTRANT               Doc::alias(QLatin1String("reentrant"))
+#define COMMAND_REIMP                   Doc::alias(QLatin1String("reimp"))
+#define COMMAND_RELATES                 Doc::alias(QLatin1String("relates"))
+#define COMMAND_RELEASEDATE             Doc::alias(QLatin1String("releasedate"))
+#define COMMAND_SINCE                   Doc::alias(QLatin1String("since"))
+#define COMMAND_SUBTITLE                Doc::alias(QLatin1String("subtitle"))
+#define COMMAND_STARTPAGE               Doc::alias(QLatin1String("startpage"))
+#define COMMAND_THREADSAFE              Doc::alias(QLatin1String("threadsafe"))
+#define COMMAND_TITLE                   Doc::alias(QLatin1String("title"))
+#define COMMAND_TYPEALIAS               Doc::alias(QLatin1String("typealias"))
+#define COMMAND_TYPEDEF                 Doc::alias(QLatin1String("typedef"))
+#define COMMAND_VARIABLE                Doc::alias(QLatin1String("variable"))
+#define COMMAND_VERSION                 Doc::alias(QLatin1String("version"))
+#define COMMAND_WRAPPER                 Doc::alias(QLatin1String("wrapper"))
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/qdoc/cppcodeparser.h b/src/qdoc/cppcodeparser.h
index 6a1b1dd44..1db389489 100644
--- a/src/qdoc/cppcodeparser.h
+++ b/src/qdoc/cppcodeparser.h
@@ -143,75 +143,6 @@ protected:
     QString exampleImageFilter;
 };
 
-#define COMMAND_ABSTRACT                Doc::alias("abstract")
-#define COMMAND_CLASS                   Doc::alias("class")
-#define COMMAND_CONTENTSPAGE            Doc::alias("contentspage")
-#define COMMAND_DITAMAP                 Doc::alias("ditamap")
-#define COMMAND_ENUM                    Doc::alias("enum")
-#define COMMAND_EXAMPLE                 Doc::alias("example")
-#define COMMAND_EXTERNALPAGE            Doc::alias("externalpage")
-#define COMMAND_FN                      Doc::alias("fn")
-#define COMMAND_GROUP                   Doc::alias("group")
-#define COMMAND_HEADERFILE              Doc::alias("headerfile")
-#define COMMAND_INDEXPAGE               Doc::alias("indexpage")
-#define COMMAND_INHEADERFILE            Doc::alias("inheaderfile")
-#define COMMAND_MACRO                   Doc::alias("macro")
-#define COMMAND_MODULE                  Doc::alias("module")
-#define COMMAND_NAMESPACE               Doc::alias("namespace")
-#define COMMAND_OVERLOAD                Doc::alias("overload")
-#define COMMAND_NEXTPAGE                Doc::alias("nextpage")
-#define COMMAND_PAGE                    Doc::alias("page")
-#define COMMAND_PREVIOUSPAGE            Doc::alias("previouspage")
-#define COMMAND_PROPERTY                Doc::alias("property")
-#define COMMAND_REIMP                   Doc::alias("reimp")
-#define COMMAND_RELATES                 Doc::alias("relates")
-#define COMMAND_STARTPAGE               Doc::alias("startpage")
-#define COMMAND_TYPEALIAS               Doc::alias("typealias")
-#define COMMAND_TYPEDEF                 Doc::alias("typedef")
-#define COMMAND_VARIABLE                Doc::alias("variable")
-#define COMMAND_QMLABSTRACT             Doc::alias("qmlabstract")
-#define COMMAND_QMLTYPE                 Doc::alias("qmltype")
-#define COMMAND_QMLPROPERTY             Doc::alias("qmlproperty")
-#define COMMAND_QMLPROPERTYGROUP        Doc::alias("qmlpropertygroup")
-#define COMMAND_QMLATTACHEDPROPERTY     Doc::alias("qmlattachedproperty")
-#define COMMAND_QMLINHERITS             Doc::alias("inherits")
-#define COMMAND_QMLINSTANTIATES         Doc::alias("instantiates")
-#define COMMAND_QMLSIGNAL               Doc::alias("qmlsignal")
-#define COMMAND_QMLATTACHEDSIGNAL       Doc::alias("qmlattachedsignal")
-#define COMMAND_QMLMETHOD               Doc::alias("qmlmethod")
-#define COMMAND_QMLATTACHEDMETHOD       Doc::alias("qmlattachedmethod")
-#define COMMAND_QMLDEFAULT              Doc::alias("default")
-#define COMMAND_QMLREADONLY             Doc::alias("readonly")
-#define COMMAND_QMLBASICTYPE            Doc::alias("qmlbasictype")
-#define COMMAND_QMLMODULE               Doc::alias("qmlmodule")
-#define COMMAND_AUDIENCE                Doc::alias("audience")
-#define COMMAND_CATEGORY                Doc::alias("category")
-#define COMMAND_PRODNAME                Doc::alias("prodname")
-#define COMMAND_COMPONENT               Doc::alias("component")
-#define COMMAND_AUTHOR                  Doc::alias("author")
-#define COMMAND_PUBLISHER               Doc::alias("publisher")
-#define COMMAND_COPYRYEAR               Doc::alias("copyryear")
-#define COMMAND_COPYRHOLDER             Doc::alias("copyrholder")
-#define COMMAND_PERMISSIONS             Doc::alias("permissions")
-#define COMMAND_LIFECYCLEVERSION        Doc::alias("lifecycleversion")
-#define COMMAND_LIFECYCLEWSTATUS        Doc::alias("lifecyclestatus")
-#define COMMAND_LICENSEYEAR             Doc::alias("licenseyear")
-#define COMMAND_LICENSENAME             Doc::alias("licensename")
-#define COMMAND_LICENSEDESCRIPTION      Doc::alias("licensedescription")
-#define COMMAND_RELEASEDATE             Doc::alias("releasedate")
-#define COMMAND_QTVARIABLE              Doc::alias("qtvariable")
-// Some of these are not used currenmtly, but they are included now for completeness.
-#define COMMAND_JSTYPE                 Doc::alias("jstype")
-#define COMMAND_JSPROPERTY             Doc::alias("jsproperty")
-#define COMMAND_JSPROPERTYGROUP        Doc::alias("jspropertygroup")
-#define COMMAND_JSATTACHEDPROPERTY     Doc::alias("jsattachedproperty")
-#define COMMAND_JSSIGNAL               Doc::alias("jssignal")
-#define COMMAND_JSATTACHEDSIGNAL       Doc::alias("jsattachedsignal")
-#define COMMAND_JSMETHOD               Doc::alias("jsmethod")
-#define COMMAND_JSATTACHEDMETHOD       Doc::alias("jsattachedmethod")
-#define COMMAND_JSBASICTYPE            Doc::alias("jsbasictype")
-#define COMMAND_JSMODULE               Doc::alias("jsmodule")
-
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 027b011be..d7f9ae676 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -48,7 +48,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#define COMMAND_VERSION                 Doc::alias("version")
 int HtmlGenerator::id = 0;
 bool HtmlGenerator::debugging_on = false;
 
diff --git a/src/qdoc/qmlcodeparser.cpp b/src/qdoc/qmlcodeparser.cpp
index 31775bb1b..86db59a3f 100644
--- a/src/qdoc/qmlcodeparser.cpp
+++ b/src/qdoc/qmlcodeparser.cpp
@@ -44,52 +44,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#define COMMAND_STARTPAGE               Doc::alias("startpage")
-#define COMMAND_VARIABLE                Doc::alias("variable")
-
-#define COMMAND_DEPRECATED              Doc::alias("deprecated")
-#define COMMAND_INGROUP                 Doc::alias("ingroup")
-#define COMMAND_INTERNAL                Doc::alias("internal")
-#define COMMAND_OBSOLETE                Doc::alias("obsolete")
-#define COMMAND_PAGEKEYWORDS            Doc::alias("pagekeywords")
-#define COMMAND_PRELIMINARY             Doc::alias("preliminary")
-#define COMMAND_SINCE                   Doc::alias("since")
-#define COMMAND_WRAPPER                 Doc::alias("wrapper")
-#define COMMAND_NOAUTOLIST              Doc::alias("noautolist")
-
-#define COMMAND_ABSTRACT                Doc::alias("abstract")
-#define COMMAND_QMLABSTRACT             Doc::alias("qmlabstract")
-#define COMMAND_QMLCLASS                Doc::alias("qmlclass")
-#define COMMAND_QMLTYPE                 Doc::alias("qmltype")
-#define COMMAND_QMLMODULE               Doc::alias("qmlmodule")
-#define COMMAND_QMLPROPERTY             Doc::alias("qmlproperty")
-#define COMMAND_QMLPROPERTYGROUP        Doc::alias("qmlpropertygroup")
-#define COMMAND_QMLATTACHEDPROPERTY     Doc::alias("qmlattachedproperty")
-#define COMMAND_QMLINHERITS             Doc::alias("inherits")
-#define COMMAND_QMLINSTANTIATES         Doc::alias("instantiates")
-#define COMMAND_INQMLMODULE             Doc::alias("inqmlmodule")
-#define COMMAND_QMLSIGNAL               Doc::alias("qmlsignal")
-#define COMMAND_QMLATTACHEDSIGNAL       Doc::alias("qmlattachedsignal")
-#define COMMAND_QMLMETHOD               Doc::alias("qmlmethod")
-#define COMMAND_QMLATTACHEDMETHOD       Doc::alias("qmlattachedmethod")
-#define COMMAND_QMLDEFAULT              Doc::alias("default")
-#define COMMAND_QMLREADONLY             Doc::alias("readonly")
-#define COMMAND_QMLBASICTYPE            Doc::alias("qmlbasictype")
-#define COMMAND_QMLMODULE               Doc::alias("qmlmodule")
-
-#define COMMAND_JSTYPE                 Doc::alias("jstype")
-#define COMMAND_JSMODULE               Doc::alias("jsmodule")
-#define COMMAND_JSPROPERTY             Doc::alias("jsproperty")
-#define COMMAND_JSPROPERTYGROUP        Doc::alias("jspropertygroup")
-#define COMMAND_JSATTACHEDPROPERTY     Doc::alias("jsattachedproperty")
-#define COMMAND_INJSMODULE             Doc::alias("injsmodule")
-#define COMMAND_JSSIGNAL               Doc::alias("jssignal")
-#define COMMAND_JSATTACHEDSIGNAL       Doc::alias("jsattachedsignal")
-#define COMMAND_JSMETHOD               Doc::alias("jsmethod")
-#define COMMAND_JSATTACHEDMETHOD       Doc::alias("jsattachedmethod")
-#define COMMAND_JSBASICTYPE            Doc::alias("jsbasictype")
-#define COMMAND_JSMODULE               Doc::alias("jsmodule")
-
 /*!
   Constructs the QML code parser.
  */
diff --git a/src/qdoc/qmlvisitor.cpp b/src/qdoc/qmlvisitor.cpp
index 0bce4c376..55672a049 100644
--- a/src/qdoc/qmlvisitor.cpp
+++ b/src/qdoc/qmlvisitor.cpp
@@ -45,47 +45,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#define COMMAND_DEPRECATED              Doc::alias(QLatin1String("deprecated"))
-#define COMMAND_INGROUP                 Doc::alias(QLatin1String("ingroup"))
-#define COMMAND_INTERNAL                Doc::alias(QLatin1String("internal"))
-#define COMMAND_OBSOLETE                Doc::alias(QLatin1String("obsolete"))
-#define COMMAND_PAGEKEYWORDS            Doc::alias(QLatin1String("pagekeywords"))
-#define COMMAND_PRELIMINARY             Doc::alias(QLatin1String("preliminary"))
-#define COMMAND_SINCE                   Doc::alias(QLatin1String("since"))
-#define COMMAND_WRAPPER                 Doc::alias(QLatin1String("wrapper"))
-#define COMMAND_NOAUTOLIST              Doc::alias(QLatin1String("noautolist"))
-
-#define COMMAND_ABSTRACT                Doc::alias(QLatin1String("abstract"))
-#define COMMAND_QMLABSTRACT             Doc::alias(QLatin1String("qmlabstract"))
-#define COMMAND_QMLCLASS                Doc::alias(QLatin1String("qmlclass"))
-#define COMMAND_QMLTYPE                 Doc::alias(QLatin1String("qmltype"))
-#define COMMAND_QMLMODULE               Doc::alias(QLatin1String("qmlmodule"))
-#define COMMAND_QMLPROPERTY             Doc::alias(QLatin1String("qmlproperty"))
-#define COMMAND_QMLPROPERTYGROUP        Doc::alias(QLatin1String("qmlpropertygroup"))
-#define COMMAND_QMLATTACHEDPROPERTY     Doc::alias(QLatin1String("qmlattachedproperty"))
-#define COMMAND_QMLINHERITS             Doc::alias(QLatin1String("inherits"))
-#define COMMAND_QMLINSTANTIATES         Doc::alias(QLatin1String("instantiates"))
-#define COMMAND_INQMLMODULE             Doc::alias(QLatin1String("inqmlmodule"))
-#define COMMAND_QMLSIGNAL               Doc::alias(QLatin1String("qmlsignal"))
-#define COMMAND_QMLATTACHEDSIGNAL       Doc::alias(QLatin1String("qmlattachedsignal"))
-#define COMMAND_QMLMETHOD               Doc::alias(QLatin1String("qmlmethod"))
-#define COMMAND_QMLATTACHEDMETHOD       Doc::alias(QLatin1String("qmlattachedmethod"))
-#define COMMAND_QMLDEFAULT              Doc::alias(QLatin1String("default"))
-#define COMMAND_QMLREADONLY             Doc::alias(QLatin1String("readonly"))
-#define COMMAND_QMLBASICTYPE            Doc::alias(QLatin1String("qmlbasictype"))
-
-#define COMMAND_JSTYPE                 Doc::alias(QLatin1String("jstype"))
-#define COMMAND_JSMODULE               Doc::alias(QLatin1String("jsmodule"))
-#define COMMAND_JSPROPERTY             Doc::alias(QLatin1String("jsproperty"))
-#define COMMAND_JSPROPERTYGROUP        Doc::alias(QLatin1String("jspropertygroup"))
-#define COMMAND_JSATTACHEDPROPERTY     Doc::alias(QLatin1String("jsattachedproperty"))
-#define COMMAND_INJSMODULE             Doc::alias(QLatin1String("injsmodule"))
-#define COMMAND_JSSIGNAL               Doc::alias(QLatin1String("jssignal"))
-#define COMMAND_JSATTACHEDSIGNAL       Doc::alias(QLatin1String("jsattachedsignal"))
-#define COMMAND_JSMETHOD               Doc::alias(QLatin1String("jsmethod"))
-#define COMMAND_JSATTACHEDMETHOD       Doc::alias(QLatin1String("jsattachedmethod"))
-#define COMMAND_JSBASICTYPE            Doc::alias(QLatin1String("jsbasictype"))
-
 #ifndef QT_NO_DECLARATIVE
 /*!
   The constructor stores all the parameters in local data members.