AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix detection of default incdirs on mac

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2016-06-02 19:58:12 +02:00
parent ccf461acf0
commit 4c23b69bf7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/features/default_pre.prf
View File

@ -48,10 +48,11 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build {
QMAKE_DEFAULT_LIBDIRS += $$clean_path($$path) QMAKE_DEFAULT_LIBDIRS += $$clean_path($$path)
} else: contains(line, "$${LITERAL_HASH}include <.*") { # #include <...> search starts here: } else: contains(line, "$${LITERAL_HASH}include <.*") { # #include <...> search starts here:
add_includes = true add_includes = true
} else: contains(line, "End of search list.*") { } else: contains(line, "End of search.*") {
add_includes = false add_includes = false
} else { } else: $$add_includes {
$$add_includes: QMAKE_DEFAULT_INCDIRS += $$clean_path($$line) !contains(line, ".* \\(framework directory\\)"): \
QMAKE_DEFAULT_INCDIRS += $$clean_path($$line)
} }
} }
QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS) QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)