AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I7d4e3238a9233d6aab32cc7a3c5a883e718113d5
Reviewed-by: Martin Smith <martin.smith@nokia.com>
This commit is contained in:
Casper van Donderen 2012-05-02 13:14:29 +02:00 committed by Qt by Nokia
parent 21c3170fa6
commit c0f0a7825e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/qdoc/node.cpp
View File

@ -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();
}

10
src/tools/qdoc/qdoc.pro
View File

@ -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