diff options
| author | Martchus | 2019-12-24 22:48:03 +0100 |
|---|---|---|
| committer | Martchus | 2019-12-24 22:48:03 +0100 |
| commit | ea5c53de6ca6a1f2634b3424a295affadb9f9854 (patch) | |
| tree | 2c1fa09b6a86140eef5f5038a35c0ee8bf86c696 /0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch | |
| parent | 47adbf49f5a96ce972c2d3160dc97da4b49c9cad (diff) | |
| download | aur-ea5c53de6ca6a1f2634b3424a295affadb9f9854.tar.gz | |
Update to 5.14.0
Diffstat (limited to '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
| -rw-r--r-- | 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch new file mode 100644 index 000000000000..882692f05fdd --- /dev/null +++ b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -0,0 +1,37 @@ +From a56c12fc0a7428ca32dc7e7f4f54ed725ef288fa 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.24.1 + |