AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix WebEngine build when VULKAN_SDK environment variable is present

Browse Source 
Instead of expanding the VULKAN_SDK environment variable at Makefile
processing time, expand it at qmake time, so that a resolved include
path is passed to WebEngine's build system GN.

Task-number: QTBUG-61823
Change-Id: I63bd661350883d22af2ccdeb7c360ed0d8d881c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Alexandru Croitor 2017-07-13 08:31:33 +02:00 committed by Laszlo Agocs
parent 410148ef1e
commit 03bb4fe6b1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/common/windows-vulkan.conf
View File

@ -1,5 +1,5 @@
# Pick up the VULKAN_SDK env var set by the LunarG SDK so that the 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. # headers are found out-of-the-box on typical Windows setups.
QMAKE_INCDIR_VULKAN = $(VULKAN_SDK)\\include QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)\\include
QMAKE_LIBS_VULKAN = QMAKE_LIBS_VULKAN =