diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-05 15:37:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-05 15:37:50 +0200 |
| commit | deee7b7eced5b240e3161d655319dbaaf2f8965c (patch) | |
| tree | 4ad6db0e97482c24f02f111cbfeec224535feb73 /mkspecs/features/win32 | |
| parent | bcd4b14026094d0077ad1069054676cc6da96251 (diff) | |
| parent | 6ad08b9cad4efefc72e64deaa0b720a3aab0fa54 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
qmake/generators/makefile.cpp
Change-Id: Ifb2633a69d0bf8cdf12d799c6259beefc279c49e
Diffstat (limited to 'mkspecs/features/win32')
| -rw-r--r-- | mkspecs/features/win32/windows_vulkan_sdk.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/win32/windows_vulkan_sdk.prf b/mkspecs/features/win32/windows_vulkan_sdk.prf index 6c08e28fe9..2aebbd3b25 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 # Do not export the include dir but resolve it on every qmake call. QMAKE_EXPORT_INCDIR_VULKAN = - |