From 82cf2489e2cdf2139914580e95c37d91be520716 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Mon, 12 Feb 2018 14:55:04 +0000 Subject: 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 --- src/qdoc/qdoc.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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\") -- cgit v1.2.1