diff options
Diffstat (limited to '0032-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
| -rw-r--r-- | 0032-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/0032-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0032-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch new file mode 100644 index 000000000000..8c18ed6c0b9a --- /dev/null +++ b/0032-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -0,0 +1,37 @@ +From 371d6eafd848635479a988a20e16d05d0a72db77 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Mon, 24 Jun 2019 13:51:02 +0200 +Subject: [PATCH 32/32] Prevent 'Cannot find feature windows_vulkan_sdk' + +See https://bugreports.qt.io/browse/QTBUG-76660 +--- + mkspecs/common/windows-vulkan.conf | 2 +- + mkspecs/features/qmake_use.prf | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/common/windows-vulkan.conf b/mkspecs/common/windows-vulkan.conf +index da061422dc..a5a8ec68d2 100644 +--- a/mkspecs/common/windows-vulkan.conf ++++ b/mkspecs/common/windows-vulkan.conf +@@ -1,2 +1,2 @@ +-load(windows_vulkan_sdk) ++load(win32/windows_vulkan_sdk) + QMAKE_LIBS_VULKAN = +diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf +index 64faa4f215..f899792e4e 100644 +--- a/mkspecs/features/qmake_use.prf ++++ b/mkspecs/features/qmake_use.prf +@@ -15,7 +15,9 @@ for(ever) { + error("Library '$$lower($$replace(nu, _, -))' is not defined.") + + DEFINES += $$eval(QMAKE_DEFINES_$${nu}) +- INCLUDEPATH += $$eval(QMAKE_INCDIR_$${nu}) ++ incdir = $$eval(QMAKE_INCDIR_$${nu}) ++ !contains(QMAKE_DEFAULT_INCDIRS, $$incdir): \ ++ INCLUDEPATH += $$incdir + } + LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) + for (nu, LD_USES) { +-- +2.24.0 + |