QDoc: Remove all occurences of 'qdoc3' in source.

Change-Id: I7d4e3238a9233d6aab32cc7a3c5a883e718113d5
Reviewed-by: Martin Smith <martin.smith@nokia.com>

diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index 5f9c45d..4d6c58a 100644 (file)
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -2654,7 +2654,7 @@ QString Node::idForNode() const
                                     str += "-" + tail;
                             }
                             else
-                                qDebug() << "qdoc3 internal error: Operator missing from operators_ map:" << op;
+                                qDebug() << "qdoc internal error: Operator missing from operators_ map:" << op;
                         }
                         else {
                             str += op;
@@ -2671,11 +2671,11 @@ QString Node::idForNode() const
                     if (parent_->subType() == QmlClass)
                         str = "qml-method-" + func->name();
                     else
-                        qDebug() << "qdoc3 internal error: Node subtype not handled:"
+                        qDebug() << "qdoc internal error: Node subtype not handled:"
                                  << parent_->subType() << func->name();
                 }
                 else
-                    qDebug() << "qdoc3 internal error: Node type not handled:"
+                    qDebug() << "qdoc internal error: Node type not handled:"
                              << parent_->type() << func->name();
 
             }

diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
index 09f9b7a..484b0c6 100644 (file)
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -92,9 +92,9 @@ SOURCES += jscodemarker.cpp \
             qmlmarkupvisitor.cpp \
             qmlvisitor.cpp
 
-### Documentation for qdoc3 ###
+### Documentation for qdoc ###
 
-qtPrepareTool(QDOC, qdoc3)
+qtPrepareTool(QDOC, qdoc)
 qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
 
 equals(QMAKE_DIR_SEP, /) {
@@ -104,11 +104,11 @@ equals(QMAKE_DIR_SEP, /) {
     QDOC = $$replace(QDOC, "/", "\\")
 }
 
-html-docs.commands = cd \"$$QT_BUILD_TREE/doc\" && $$QDOC $$QT_SOURCE_TREE/tools/qdoc3/doc/config/qdoc.qdocconf
+html-docs.commands = cd \"$$QT_BUILD_TREE/doc\" && $$QDOC $$QT_SOURCE_TREE/tools/qdoc/doc/config/qdoc.qdocconf
 html-docs.files = $$QT_BUILD_TREE/doc/html
 
-qch-docs.commands = cd \"$$QT_BUILD_TREE/doc\" && $$QHELPGENERATOR $$QT_BUILD_TREE/tools/qdoc3/doc/html/qdoc.qhp -o $$QT_BUILD_TREE/tools/qdoc3/doc/qch/qdoc.qch
-qch-docs.files = $$QT_BUILD_TREE/tools/qdoc3/doc/qch
+qch-docs.commands = cd \"$$QT_BUILD_TREE/doc\" && $$QHELPGENERATOR $$QT_BUILD_TREE/tools/qdoc/doc/html/qdoc.qhp -o $$QT_BUILD_TREE/tools/qdoc/doc/qch/qdoc.qch
+qch-docs.files = $$QT_BUILD_TREE/tools/qdoc/doc/qch
 qch-docs.path = $$[QT_INSTALL_DOCS]
 qch-docs.CONFIG += no_check_exist directory