diff options
| author | Sergio Martins <sergio.martins@kdab.com> | 2018-02-12 14:55:04 +0000 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2018-02-12 21:14:27 +0000 |
| commit | 82cf2489e2cdf2139914580e95c37d91be520716 (patch) | |
| tree | 80beb7c9167e0eb02791da69aa516fbf5649b6b9 | |
| parent | c04360c7f7538458c67556ad589ba6733daf2b59 (diff) | |
| download | qttools-82cf2489e2cdf2139914580e95c37d91be520716.tar.gz | |
qdoc: don't add clang inc dir in system location to INCLUDEPATH
qmake passes system paths via -isystem, which wreaks havoc.
Fix copied from QtCreator's build system.
See also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
Task-number: QTBUG-65920
Change-Id: Ifae6aea6ccb1a15282657377880a8f5a37ea42a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | src/qdoc/qdoc.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qdoc/qdoc.pro b/src/qdoc/qdoc.pro index 30de9df08..363b2f199 100644 --- a/src/qdoc/qdoc.pro +++ b/src/qdoc/qdoc.pro @@ -12,7 +12,8 @@ qtHaveModule(qmldevtools-private) { } LIBS += $$CLANG_LIBS -INCLUDEPATH += $$CLANG_INCLUDEPATH +!contains(QMAKE_DEFAULT_INCDIRS, $$CLANG_INCLUDEPATH): INCLUDEPATH += $$CLANG_INCLUDEPATH + !disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR DEFINES += $$shell_quote(CLANG_RESOURCE_DIR=\"$${CLANG_LIBDIR}/clang/$${CLANG_VERSION}/include\") |