aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2022-03-31 09:48:28 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2022-05-06 08:43:39 +0300
commite701d8f0cdd65b66569feec89fe4dc8744923acd (patch)
tree990dc96f8690a0fc1c31d991aa9f8bf2ff46d131
parent07468c501431d003e2a5a615031613f3cf113499 (diff)
IFW: Build IFW with 64bit MSVC2019
Change-Id: I7dfadcd623d4aabdb545fa09d23d85767d7fafa9 Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rw-r--r--coin/platform_configs/installer-framework.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml
index 6c5065c6..31229f65 100644
--- a/coin/platform_configs/installer-framework.yaml
+++ b/coin/platform_configs/installer-framework.yaml
@@ -3,12 +3,12 @@ Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-51'
- Compiler: 'MSVC2015'
- Target arch: 'x86'
+ Compiler: 'MSVC2019'
+ Target arch: 'x86_64'
Features: ['Packaging']
- Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime'
- Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG=']
- Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86']
+ Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x64% -L %STATIC_OPENSSL_LIB_x64% -prefix c:\Users\qt\work\install -static-runtime'
+ Environment variables: ['TARGET_ARCHITECTURE=x86_64', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG=']
+ Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
QmakeArguments: [
'qtdeclarative': '-no-feature-d3d12'
]