diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-09-20 08:20:47 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-20 08:20:47 +0200 |
commit | 73f880d3934650de18def4eee615162d47416674 (patch) | |
tree | 07acedd242b334aba49df57a2983c07224b6d385 /mkspecs/features/win32 | |
parent | 6234286925153279ca259cec04429fa584187b16 (diff) | |
parent | 0d9f43d534983411e37a9f3912de272a4a6ced64 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/makefile.h
Change-Id: I4c2deac4f6376c85f5e4fe7fb0ccc9ab9a013cd7
Diffstat (limited to 'mkspecs/features/win32')
-rw-r--r-- | mkspecs/features/win32/windows_vulkan_sdk.prf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/win32/windows_vulkan_sdk.prf b/mkspecs/features/win32/windows_vulkan_sdk.prf index 2aebbd3b25..4dc0e50090 100644 --- a/mkspecs/features/win32/windows_vulkan_sdk.prf +++ b/mkspecs/features/win32/windows_vulkan_sdk.prf @@ -3,6 +3,11 @@ isEmpty(QMAKE_INCDIR_VULKAN) { # headers are found out-of-the-box on typical Windows setups. QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)/include + # Do not add default include paths as that can knock std headers + # out of their stride due to their usage of #include_next. + contains(QMAKE_DEFAULT_INCDIRS, $$QMAKE_INCDIR_VULKAN): \ + QMAKE_INCDIR_VULKAN = + # Do not export the include dir but resolve it on every qmake call. QMAKE_EXPORT_INCDIR_VULKAN = - } |