diff options
Diffstat (limited to '0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
| -rw-r--r-- | 0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 85c2d9bf342e..3e2bb0106f56 100644 --- a/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,12 +1,13 @@ -From a3f19f84f5f7776ec509c84fb10cb9609c0c67fe Mon Sep 17 00:00:00 2001 +From a21352b369e9218d49e0f4e29ae30a5a58566953 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 33/33] Prevent 'Cannot find feature windows_vulkan_sdk' +See https://bugreports.qt.io/browse/QTBUG-76660 --- - mkspecs/common/windows-vulkan.conf | 2 +- - mkspecs/features/win32/windows_vulkan_sdk.prf | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 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 @@ -16,19 +17,21 @@ index da061422dc..a5a8ec68d2 100644 -load(windows_vulkan_sdk) +load(win32/windows_vulkan_sdk) QMAKE_LIBS_VULKAN = -diff --git a/mkspecs/features/win32/windows_vulkan_sdk.prf b/mkspecs/features/win32/windows_vulkan_sdk.prf -index 6c08e28fe9..a80b0602a8 100644 ---- a/mkspecs/features/win32/windows_vulkan_sdk.prf -+++ b/mkspecs/features/win32/windows_vulkan_sdk.prf -@@ -1,7 +1,7 @@ - isEmpty(QMAKE_INCDIR_VULKAN) { - # Pick up the VULKAN_SDK env var set by the LunarG SDK so that the Vulkan - # headers are found out-of-the-box on typical Windows setups. -- QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)\\include -+ # QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)/include +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.") - # Do not export the include dir but resolve it on every qmake call. - QMAKE_EXPORT_INCDIR_VULKAN = - + 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.22.0 +2.23.0 |