summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/qmlcodeparser.h
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-12-06 17:52:38 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-12-06 17:52:38 (GMT)
commitbb6d5d9eb2a40de14ab3a41fbdaf4092c1a3b4e8 (patch)
tree44614b8add20ea5f89e3cbe5e87ba8b9eff1e781 /tools/qdoc3/qmlcodeparser.h
parent6834727fff1f74e15b2c9f25af1845e7f529afaa (diff)
downloadQt-bb6d5d9eb2a40de14ab3a41fbdaf4092c1a3b4e8.zip
Qt-bb6d5d9eb2a40de14ab3a41fbdaf4092c1a3b4e8.tar.gz
Qt-bb6d5d9eb2a40de14ab3a41fbdaf4092c1a3b4e8.tar.bz2
Added missing qmlcodemarker.cpp and qmlcodemarker.h files.
Added code to remove pragmas before parsing and add them to the output. The extractPragmas() function was copied into both qmlcodeparser.cpp and qmlcodemarker.cpp from src/declarative/qml/qdeclarativescriptparser.cpp, and was modified to return either nothing (for the API parser) or a list of removed pragmas (for the code marker).
Diffstat (limited to 'tools/qdoc3/qmlcodeparser.h')
-rw-r--r--tools/qdoc3/qmlcodeparser.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/qdoc3/qmlcodeparser.h b/tools/qdoc3/qmlcodeparser.h
index a99e8a3..bbacd72 100644
--- a/tools/qdoc3/qmlcodeparser.h
+++ b/tools/qdoc3/qmlcodeparser.h
@@ -75,6 +75,9 @@ public:
const QString& filePath, Tree *tree);
virtual void doneParsingSourceFiles(Tree *tree);
+ /* Copied from src/declarative/qml/qdeclarativescriptparser.cpp */
+ void extractPragmas(QString &script);
+
protected:
virtual QSet<QString> topicCommands();
virtual QSet<QString> otherMetaCommands();