diff --git a/src/tools/qdoc/config.h b/src/tools/qdoc/config.h
index 6ed37fce03..baab42e59d 100644
--- a/src/tools/qdoc/config.h
+++ b/src/tools/qdoc/config.h
@@ -132,7 +132,7 @@ private:
 };
 
 #define CONFIG_ALIAS                    "alias"
-#define CONFIG_BASE                     "base"      // ### don't document for now
+#define CONFIG_BASE                     "base"
 #define CONFIG_BASEDIR                  "basedir"
 #define CONFIG_CODEINDENT               "codeindent"
 #define CONFIG_DEFINES                  "defines"
@@ -184,17 +184,13 @@ private:
 #define CONFIG_TEMPLATEDIR              "templatedir"
 #define CONFIG_TABSIZE                  "tabsize"
 #define CONFIG_TAGFILE                  "tagfile"
-#define CONFIG_TRANSLATORS              "translators" // ### don't document for now
+#define CONFIG_TRANSLATORS              "translators"
 #define CONFIG_URL                      "url"
 #define CONFIG_VERSION                  "version"
 #define CONFIG_VERSIONSYM               "versionsym"
-
 #define CONFIG_FILEEXTENSIONS           "fileextensions"
 #define CONFIG_IMAGEEXTENSIONS          "imageextensions"
-
-#ifdef QDOC_QML
 #define CONFIG_QMLONLY                  "qmlonly"
-#endif
 
 QT_END_NAMESPACE
 
diff --git a/src/tools/qdoc/ditaxmlgenerator.h b/src/tools/qdoc/ditaxmlgenerator.h
index 56cf48614c..20de6b8061 100644
--- a/src/tools/qdoc/ditaxmlgenerator.h
+++ b/src/tools/qdoc/ditaxmlgenerator.h
@@ -556,9 +556,7 @@ private:
     NodeMap obsoleteClasses;
     NodeMap namespaceIndex;
     NodeMap serviceClasses;
-#ifdef QDOC_QML
     NodeMap qmlClasses;
-#endif
     QMap<QString, NodeMap > funcIndex;
     QMap<Text, const Node*> legaleseTexts;
     static int id;
@@ -573,7 +571,7 @@ private:
 
 #define DITAXMLGENERATOR_ADDRESS           "address"
 #define DITAXMLGENERATOR_FOOTER            "footer"
-#define DITAXMLGENERATOR_GENERATEMACREFS   "generatemacrefs" // ### document me
+#define DITAXMLGENERATOR_GENERATEMACREFS   "generatemacrefs"
 #define DITAXMLGENERATOR_POSTHEADER        "postheader"
 #define DITAXMLGENERATOR_POSTPOSTHEADER    "postpostheader"
 #define DITAXMLGENERATOR_STYLE             "style"
diff --git a/src/tools/qdoc/doc.cpp b/src/tools/qdoc/doc.cpp
index af7e26dd17..7033131d9d 100644
--- a/src/tools/qdoc/doc.cpp
+++ b/src/tools/qdoc/doc.cpp
@@ -2027,13 +2027,8 @@ void DocParser::appendWord(const QString &word)
 void DocParser::appendToCode(const QString& markedCode)
 {
     Atom::Type lastType = priv->text.lastAtom()->type();
-#ifdef QDOC_QML
     if (lastType != Atom::Qml && lastType != Atom::Code && lastType != Atom::JavaScript)
         append(Atom::Qml);
-#else
-    if (lastType != Atom::Code)
-        append(Atom::Code);
-#endif
     priv->text.lastAtom()->appendString(markedCode);
 }
 
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 5755b9afb4..4fa2bb63b4 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -408,7 +408,6 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                                                  marker,relative))
               << "</pre>\n";
         break;
-#ifdef QDOC_QML
     case Atom::Qml:
         out() << "<pre class=\"qml\">"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
@@ -421,7 +420,6 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                                                  marker,relative))
               << "</pre>\n";
         break;
-#endif
     case Atom::CodeNew:
         out() << "<p>you can rewrite it as</p>\n"
               << "<pre class=\"cpp\">"
@@ -1149,12 +1147,10 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "<b class=\"redFont\"><code>\\" << protectEnc(atom->string())
               << "</code></b>";
         break;
-#ifdef QDOC_QML
     case Atom::QmlText:
     case Atom::EndQmlText:
         // don't do anything with these. They are just tags.
         break;
-#endif
     default:
         unknownAtom(atom);
     }
diff --git a/src/tools/qdoc/qmlvisitor.cpp b/src/tools/qdoc/qmlvisitor.cpp
index a1031f2e83..17f717ae17 100644
--- a/src/tools/qdoc/qmlvisitor.cpp
+++ b/src/tools/qdoc/qmlvisitor.cpp
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#define COMMAND_DEPRECATED              Doc::alias(QLatin1String("deprecated")) // ### don't document
+#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"))
@@ -488,7 +488,6 @@ bool QmlDocVisitor::visit(QQmlJS::AST::UiPublicMember *member)
             if (qmlClass) {
                 QString name = member->name.toString();
                 QmlPropertyNode *qmlPropNode = new QmlPropertyNode(qmlClass, name, type, false);
-                //qmlPropNode->setLocation(doc.location());
                 qmlPropNode->setReadOnly(member->isReadonlyMember);
                 if (member->isDefaultMember)
                     qmlPropNode->setDefault();