diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-02 19:58:12 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-17 09:47:02 +0000 |
| commit | 4c23b69bf72bf0ed660b98268b9b4cb1da9f302d (patch) | |
| tree | e4b08d812d77e81a1c4c90f31dd860bfde458e65 /mkspecs/features/default_pre.prf | |
| parent | ccf461acf0b6a596c1bad7e7391fa4a851db9e93 (diff) | |
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 <jake.petroules@qt.io>
Diffstat (limited to 'mkspecs/features/default_pre.prf')
| -rw-r--r-- | mkspecs/features/default_pre.prf | 7 |
1 files 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) |