summaryrefslogtreecommitdiff
path: root/mkspecs
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2016-08-29 14:41:46 +0200
committerMartin Smith <martin.smith@qt.io>2017-08-10 07:32:32 +0000
commit5b090261774ca0b18b0149a960d658ed3d06c3bc (patch)
tree42beda2b5d826474c197978ae5acb1af21970579 /mkspecs
parentc9cc240cdc67d816aef5e65ffacf152d9313dd1b (diff)
downloadqttools-5b090261774ca0b18b0149a960d658ed3d06c3bc.tar.gz
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 'mkspecs')
-rw-r--r--mkspecs/features/qt_find_clang.prf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_find_clang.prf b/mkspecs/features/qt_find_clang.prf
index 14a2e80bf..7e65d23fb 100644
--- a/mkspecs/features/qt_find_clang.prf
+++ b/mkspecs/features/qt_find_clang.prf
@@ -84,8 +84,8 @@ for(_, $$list(_)) { # just a way to break easily
else: \
CLANG_LIBS += -lclang
- !versionIsAtLeast($$CLANG_VERSION, "3.6.2") {
- log("LLVM/Clang version >= 3.6.2 required, version provided: $$CLANG_VERSION.$$escape_expand(\\n)")
+ !versionIsAtLeast($$CLANG_VERSION, "3.9.0") {
+ log("LLVM/Clang version >= 3.9.0 required, version provided: $$CLANG_VERSION.$$escape_expand(\\n)")
log("Clang was found in $$CLANG_INSTALL_DIR. Set the CLANG_INSTALL_DIR environment variable to override.$$escape_expand(\\n)")
break()
}