diff options
| author | Martin Smith <martin.smith@qt.io> | 2016-08-29 14:41:46 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2017-08-10 07:32:32 +0000 |
| commit | 5b090261774ca0b18b0149a960d658ed3d06c3bc (patch) | |
| tree | 42beda2b5d826474c197978ae5acb1af21970579 /src/qdoc/config.h | |
| parent | c9cc240cdc67d816aef5e65ffacf152d9313dd1b (diff) | |
qdoc: Add "clangdefines" to Config class
The qdoc 'defines' config variable lists values
that contain '*' to represent wildcards, but clang
doesn't accept them. This change adds a new config
variable called 'clangdefines' which explicitly
lists all the defines that match the wildcards.
It also lists several Qt defines for C++11 stuff,
because when clangqdoc comes into use, all the
supported compilers for Qt will support C++11
constructs.
There might be a few defines listed in clangdefines
that are unnecessary and maybe a few that we really
should not include, but we can adjust the list as
needed.
Also included in this change: Tell clang never to fail
(i.e. keep parsing no matter how many errors are found),
and tell clang not to print parsing errors, because they
obscure the qdoc errors in the output. clangqdoc should
assume that the source files are correct, but some of the
include files, especially system level stuff, will not be
present. clangqdoc doesn't care about these missing files,
because they aren't part of the documentation.
Change-Id: I84e1cae24d961a82d16ee705333d6f36955d35de
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src/qdoc/config.h')
| -rw-r--r-- | src/qdoc/config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qdoc/config.h b/src/qdoc/config.h index 588e0e0a9..576f7375d 100644 --- a/src/qdoc/config.h +++ b/src/qdoc/config.h @@ -160,6 +160,7 @@ struct ConfigStrings static QString BASE; static QString BASEDIR; static QString BUILDVERSION; + static QString CLANGDEFINES; static QString CODEINDENT; static QString CODEPREFIX; static QString CODESUFFIX; @@ -241,6 +242,7 @@ struct ConfigStrings #define CONFIG_BASE ConfigStrings::BASE #define CONFIG_BASEDIR ConfigStrings::BASEDIR #define CONFIG_BUILDVERSION ConfigStrings::BUILDVERSION +#define CONFIG_CLANGDEFINES ConfigStrings::CLANGDEFINES #define CONFIG_CODEINDENT ConfigStrings::CODEINDENT #define CONFIG_CODEPREFIX ConfigStrings::CODEPREFIX #define CONFIG_CODESUFFIX ConfigStrings::CODESUFFIX |