summarylogtreecommitdiffstats
path: root/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
blob: 16208a1a15c7f23934b35f0dfff7dbfb22f90deb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From 7a33424a70724ff3a404d4f8a5d537fd6d6b4895 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 24 Jun 2019 13:51:02 +0200
Subject: [PATCH 31/31] 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 8475e4111a..c0eb8faa17 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.25.0