diff options
| author | Martin Smith <martin.smith@digia.com> | 2015-03-13 12:05:10 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@digia.com> | 2015-03-14 10:02:21 +0000 |
| commit | 4da66d5dbf6b1752bdaff5d13b20531608081b70 (patch) | |
| tree | 91503f98e038dc5a0b20782e501fb7ddeb056e62 /src/tools/qdoc/doc.cpp | |
| parent | 32d1803d60d06b62a55e2cfb9f084eb9e527cc54 (diff) | |
qdoc: ignores .pragma and .import in javascript files
For some reason, the QML/JS parser doesn't like them,
so they must be removed when qdoc parses JavaScript
code. This update handles every case I could find
except jquery.min.js, which is a different problem.
Change-Id: Iacbc4eda554516496a642189368d63d6560e3571
Task-number: QTBUG-44817
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/doc.cpp')
| -rw-r--r-- | src/tools/qdoc/doc.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/qdoc/doc.cpp b/src/tools/qdoc/doc.cpp index 7965ea898fd..e911eed28bd 100644 --- a/src/tools/qdoc/doc.cpp +++ b/src/tools/qdoc/doc.cpp @@ -49,6 +49,7 @@ #include <ctype.h> #include <limits.h> #include <qdebug.h> +#include "generator.h" QT_BEGIN_NAMESPACE @@ -3319,9 +3320,7 @@ CodeMarker *Doc::quoteFromFile(const Location &location, QString dirPath = QFileInfo(filePath).path(); CodeMarker *marker = CodeMarker::markerForFileName(fileName); - quoter.quoteFromFile(userFriendlyFilePath, - code, - marker->markedUpCode(code, 0, location)); + quoter.quoteFromFile(userFriendlyFilePath, code, marker->markedUpCode(code, 0, location)); return marker; } |