38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 25a9b54ce96ea574fe18bc6df5dc2ee571d22c36 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.29.2
|
|
|