diff options
| author | Martin Smith <martin.smith@nokia.com> | 2012-06-11 11:29:31 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 04:29:31 +0200 |
| commit | 14b07221664f95aea7603d6b7625c4467641b57c (patch) | |
| tree | c77323108d2efc9e45f57e6a39a647248b54f906 /src/tools/qdoc/puredocparser.cpp | |
| parent | 9e1a9878aaeac75f5c9e73a0d0e1a4e489e13cbc (diff) | |
qdoc: Better error messages for QML command errors
Some error messages were not clear for these qdoc commands: \qmlclass,
\qmlmodule, \inqmlmodule, and \qmlproperty. They have been made clearer
now.
Also, qdoc now parses input files in the same order all the time now.
The order is alphabetic now. This might not be the optimal order.
Change-Id: Id53a5ec8105009c71f4bbd41973a54aed7821099
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/puredocparser.cpp')
| -rw-r--r-- | src/tools/qdoc/puredocparser.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/qdoc/puredocparser.cpp b/src/tools/qdoc/puredocparser.cpp index 19a19373bd7..0b6c7baa5be 100644 --- a/src/tools/qdoc/puredocparser.cpp +++ b/src/tools/qdoc/puredocparser.cpp @@ -78,8 +78,10 @@ void PureDocParser::parseSourceFile(const Location& location, Tree *tree) { QFile in(filePath); + currentFile_ = filePath; if (!in.open(QIODevice::ReadOnly)) { location.error(tr("Can't open source file '%1' (%2)").arg(filePath).arg(strerror(errno))); + currentFile_.clear(); return; } createOutputSubdirectory(location, filePath); @@ -98,6 +100,7 @@ void PureDocParser::parseSourceFile(const Location& location, processQdocComments(); in.close(); + currentFile_.clear(); } /*! @@ -158,7 +161,7 @@ bool PureDocParser::processQdocComments() if ((topic == COMMAND_QMLPROPERTY) || (topic == COMMAND_QMLATTACHEDPROPERTY)) { Doc nodeDoc = doc; - Node* node = processTopicCommandGroup(topic,args); + Node* node = processTopicCommandGroup(nodeDoc,topic,args); if (node != 0) { nodes.append(node); docs.append(nodeDoc); |