diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-04-17 21:23:44 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-04-19 10:41:41 +0000 |
| commit | f9ad1f5844af1e42c8de3cf10f6a9597924d9f9e (patch) | |
| tree | 48ef6bfa3d2317ba83fc80d330f5bef3f752268e /share/qbs/modules | |
| parent | d38fd9fa901cd7f30821367b831676837eb82fe3 (diff) | |
| download | qbs-f9ad1f5844af1e42c8de3cf10f6a9597924d9f9e.tar.gz | |
Allow to specify windowsSdkVersion
Previously, it was not possible to use older windows SDK version. Fix
that by introducing the new property that is passed to vcvarsall.bat
Task-number: QBS-1498
Change-Id: Ic526eabb8ff82ddd85c93e90fd20421595a121f4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/cpp/windows-clang-cl.qbs | 1 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc-base.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/windows-clang-cl.qbs b/share/qbs/modules/cpp/windows-clang-cl.qbs index a34a67ad2..556efb042 100644 --- a/share/qbs/modules/cpp/windows-clang-cl.qbs +++ b/share/qbs/modules/cpp/windows-clang-cl.qbs @@ -53,6 +53,7 @@ MsvcBaseModule { vcvarsallFilePath: vcvarsallPath enableDefinesByLanguage: enableCompilerDefinesByLanguage preferredArchitecture: qbs.architecture + winSdkVersion: windowsSdkVersion } qbs.architecture: clangClProbe.found ? clangClProbe.architecture : original diff --git a/share/qbs/modules/cpp/windows-msvc-base.qbs b/share/qbs/modules/cpp/windows-msvc-base.qbs index f5fde9556..81fe48385 100644 --- a/share/qbs/modules/cpp/windows-msvc-base.qbs +++ b/share/qbs/modules/cpp/windows-msvc-base.qbs @@ -108,6 +108,8 @@ CppModule { } } + property string windowsSdkVersion + Rule { condition: useCPrecompiledHeader inputs: ["c_pch_src"] diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index d5b5baf92..33c5e74c8 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -51,6 +51,7 @@ MsvcBaseModule { compilerFilePath: compilerPath enableDefinesByLanguage: enableCompilerDefinesByLanguage preferredArchitecture: qbs.architecture + winSdkVersion: windowsSdkVersion } qbs.architecture: msvcProbe.found ? msvcProbe.architecture : original |