summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/qmlcodeparser.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2012-05-24 12:23:59 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-25 17:23:20 +0200
commita755049931031d7e234ba157c960e7cf96489b2a (patch)
tree8224378c1541772dc43072af6c943885972e9092 /src/tools/qdoc/qmlcodeparser.cpp
parent4830bcc9626ba285257aa170922360b6207b4261 (diff)
qdoc: Fixed pure doc parser
This parser was meant to parse any file for qdoc comments only, ignoring everything else that is not inside a qdoc comment. But it wasn't doing that. It was parsing all code, regardless of the language, using the C++ parser. Now it has been corrected to look at qdoc comments and skip over everything else. Note thast this means qdoc will expect a qdoc topic command in each and every qdoc comment in the file. The posiution of the qdoc comment with respect to the code it is meant to document is not taken into account in the pure doc parser. This is in contrast to the QML and C++ parsers which do take comment location into account in some cases. Change-Id: I0804a4149baa942b463e0b6990c71e4039ac1a50 Reviewed-by: Keith Isdale <keith.isdale@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src/tools/qdoc/qmlcodeparser.cpp')
-rw-r--r--src/tools/qdoc/qmlcodeparser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/qmlcodeparser.cpp b/src/tools/qdoc/qmlcodeparser.cpp
index 23b8af8567..688087d793 100644
--- a/src/tools/qdoc/qmlcodeparser.cpp
+++ b/src/tools/qdoc/qmlcodeparser.cpp
@@ -126,7 +126,7 @@ QString QmlCodeParser::language()
*/
QStringList QmlCodeParser::sourceFileNameFilter()
{
- return QStringList("*.qml");
+ return QStringList() << "*.qml";
}
/*!