diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-22 22:28:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-22 22:28:33 +0200 |
| commit | c0f7cc3a3cc3f06b09591f25277f8083b3a55581 (patch) | |
| tree | ecf3d3f49d6dc85b55fbdbe999e386ceda31ef39 /mkspecs/features/win32/windows_vulkan_sdk.prf | |
| parent | 139240ac671953f0763308f235d8b868c1efe1b1 (diff) | |
| parent | aa6d7dd7ee306c0adbcd42b013d1e749072205bb (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic274a375d6fc1312ced2354e034dc0980dd47c51
Diffstat (limited to 'mkspecs/features/win32/windows_vulkan_sdk.prf')
| -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 = - } |