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 <[email protected]>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/tools/qdoc/codeparser.h b/src/tools/qdoc/codeparser.h
index c4429ff79a2..94529338ad8 100644
--- a/src/tools/qdoc/codeparser.h
+++ b/src/tools/qdoc/codeparser.h
@@ -75,6 +75,11 @@ public:
     virtual void doneParsingHeaderFiles(Tree *tree);
     virtual void doneParsingSourceFiles(Tree *tree) = 0;
 
+    bool isParsingH() const;
+    bool isParsingCpp() const;
+    bool isParsingQdoc() const;
+    const QString& currentFile() const { return currentFile_; }
+
     void createOutputSubdirectory(const Location& location, const QString& filePath);
 
     static void initialize(const Config& config);
@@ -95,6 +100,7 @@ protected:
     static void extractPageLinkAndDesc(const QString& arg,
                                        QString* link,
                                        QString* desc);
+    QString currentFile_;
 
 private:
     static QString currentSubDir_;