summaryrefslogtreecommitdiffstats
path: root/src/qdoc/config.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2016-03-03 13:12:47 +0100
committerMartin Smith <martin.smith@qt.io>2017-08-10 07:31:47 +0000
commitb032aee53c8fb6807485186f276ca25b86ac1251 (patch)
treea23ca6f0a1e2d13b2629299a49234035b1fb3863 /src/qdoc/config.h
parent3c74e2594595f06b3e07f441b254ee7f57b2c770 (diff)
Use clang as a parser in qdoc
The file qt_find_clang.prf is inspired by qtcreator's clang_installation.pri. The code from the while loop in ClangVisitor::parseProperty contains code moved from CppCodeParser::matchProperty. The code in the for loop of ClangCodeParser::parseSourceFile (from the "Doc parses the comment"), is mostly moved from CppCodeParser::matchDocsAndStuff. In CppCodeParser, most of the code is removed since clang is used for parsing. We just need to leave enough to parse the declaration in the comments which still use the old parser (\fn, ...) Known issues: - When the parameter name is a comment, it is lost. (e.g. QObject::eventFilter(QObject * /* watched */, QEvent * /* event */) - I can't compute default parameters when they are expanded from a macro. (e.g. QObject::tr) - Instances of #ifndef Q_QDOC need to be reviewed Change-Id: I92d4ca4fc52810d9d3de433147a9953eea3a1802 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src/qdoc/config.h')
-rw-r--r--src/qdoc/config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qdoc/config.h b/src/qdoc/config.h
index 298cd3f63..588e0e0a9 100644
--- a/src/qdoc/config.h
+++ b/src/qdoc/config.h
@@ -188,6 +188,7 @@ struct ConfigStrings
static QString IGNORETOKENS;
static QString IMAGEDIRS;
static QString IMAGES;
+ static QString INCLUDEPATHS;
static QString INDEXES;
static QString LANDINGPAGE;
static QString LANGUAGE;
@@ -268,6 +269,7 @@ struct ConfigStrings
#define CONFIG_IGNORETOKENS ConfigStrings::IGNORETOKENS
#define CONFIG_IMAGEDIRS ConfigStrings::IMAGEDIRS
#define CONFIG_IMAGES ConfigStrings::IMAGES
+#define CONFIG_INCLUDEPATHS ConfigStrings::INCLUDEPATHS
#define CONFIG_INDEXES ConfigStrings::INDEXES
#define CONFIG_LANDINGPAGE ConfigStrings::LANDINGPAGE
#define CONFIG_LANGUAGE ConfigStrings::LANGUAGE