diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-06 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-06 01:00:13 +0200 |
| commit | e4e5a1f0b7f85b4c8b593a06a67d83f5be09004e (patch) | |
| tree | dac64fe28e21f02938be5c726002b379750fe7ad /mkspecs | |
| parent | 615b02bfa2fb861f362c511087e6962660c25ea3 (diff) | |
| parent | a50b29d65bddae44aedfd9372502f656656803d5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iaad9509712c848ed42ada2c25065162a6fc5a930
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/windows-vulkan.conf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 6 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_pris.prf | 8 | ||||
| -rw-r--r-- | mkspecs/features/win32/windows_vulkan_sdk.prf | 8 |
4 files changed, 19 insertions, 8 deletions
diff --git a/mkspecs/common/windows-vulkan.conf b/mkspecs/common/windows-vulkan.conf index 5f930c7910..da061422dc 100644 --- a/mkspecs/common/windows-vulkan.conf +++ b/mkspecs/common/windows-vulkan.conf @@ -1,5 +1,2 @@ -# 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 +load(windows_vulkan_sdk) QMAKE_LIBS_VULKAN = diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index eae4100e64..94eb012b81 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -963,8 +963,10 @@ defineTest(qtConfExportLibrary) { defines = $$eval($${spfx}.defines) !isEmpty(defines): qtConfOutputVar(assign, $$output, QMAKE_DEFINES_$$NAME, $$defines) includes = $$eval($${spfx}.exportincludedir) - isEmpty(includes): includes = $$eval($${spfx}.includedir) - !isEmpty(includes): qtConfOutputVar(assign, $$output, QMAKE_INCDIR_$$NAME, $$includes) + !equals(includes, -) { + isEmpty(includes): includes = $$eval($${spfx}.includedir) + !isEmpty(includes): qtConfOutputVar(assign, $$output, QMAKE_INCDIR_$$NAME, $$includes) + } uses = $$eval($${lpfx}.dependencies) !isEmpty(uses) { # FIXME: ideally, we would export transitive deps only for static diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index e0556ce960..e892f83432 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -60,8 +60,12 @@ defineReplace(qtExportLibsForModule) { QMAKE_LIBS_$$NAME QMAKE_LIBS_$${NAME}_DEBUG QMAKE_LIBS_$${NAME}_RELEASE \ QMAKE_DEFINES_$$NAME QMAKE_INCDIR_$$NAME for (var, vars) { - defined($$var, var): \ - result += "$$var = $$val_escape($$var)" + expvar = $$var + expvar ~= s/^QMAKE_/QMAKE_EXPORT_/ + defined($$expvar, var):equals($$expvar, -): next() + !defined($$expvar, var): expvar = $$var + defined($$expvar, var): \ + result += "$$var = $$val_escape($$expvar)" } } return($$result) diff --git a/mkspecs/features/win32/windows_vulkan_sdk.prf b/mkspecs/features/win32/windows_vulkan_sdk.prf new file mode 100644 index 0000000000..6c08e28fe9 --- /dev/null +++ b/mkspecs/features/win32/windows_vulkan_sdk.prf @@ -0,0 +1,8 @@ +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 + + # Do not export the include dir but resolve it on every qmake call. + QMAKE_EXPORT_INCDIR_VULKAN = - +} |