diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-20 14:09:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-21 08:39:41 +0200 |
| commit | ea438b2508f329698e11c6dae6994d441c6e67df (patch) | |
| tree | 7a6052b98ba1ff6e0258c52cfc2726e197f53dd2 /mkspecs/features/default_pre.prf | |
| parent | a2f319e9fb2f7595fc16d0d79e26438463051a53 (diff) | |
| parent | 5f0ec7305e4310123ddeb98d3523087e3c560d9c (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/global/qsysinfo.h
src/corelib/kernel/qcoreapplication_win.cpp
src/gui/text/qdistancefield.cpp
src/gui/text/qdistancefield_p.h
src/plugins/platforms/windows/qwindowsglcontext.cpp
src/plugins/platforms/windows/qwindowsglcontext.h
Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
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 d40054cf79..293f7ba0bd 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) |