From 4c23b69bf72bf0ed660b98268b9b4cb1da9f302d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 2 Jun 2016 19:58:12 +0200 Subject: fix detection of default incdirs on mac don't add framework directories (including the respective marker!). this is consistent with the unix configure code. Change-Id: I2e187057bc3fe2b35128cd5dc2af57b9f3685d83 Reviewed-by: Jake Petroules --- mkspecs/features/default_pre.prf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index cffffdcf25..d760586f74 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -48,10 +48,11 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build { QMAKE_DEFAULT_LIBDIRS += $$clean_path($$path) } else: contains(line, "$${LITERAL_HASH}include <.*") { # #include <...> search starts here: add_includes = true - } else: contains(line, "End of search list.*") { + } else: contains(line, "End of search.*") { add_includes = false - } else { - $$add_includes: QMAKE_DEFAULT_INCDIRS += $$clean_path($$line) + } else: $$add_includes { + !contains(line, ".* \\(framework directory\\)"): \ + QMAKE_DEFAULT_INCDIRS += $$clean_path($$line) } } QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS) -- cgit v1.2.3