diff options
| author | Toni Saario <toni.saario@qt.io> | 2021-05-21 15:22:46 +0300 |
|---|---|---|
| committer | Toni Saario <toni.saario@qt.io> | 2021-06-17 06:24:03 +0000 |
| commit | 5ba9b7c9799c3c20dd62ce8bf4316a79ee52a7cf (patch) | |
| tree | 1df52e87b7de2c3dda191de696cf19863bf9a1ca | |
| parent | 55a2b79e223aa2c39e3e78a2d3b1b1deb5c51b05 (diff) | |
Disable D3D12 on Windows IFW
Change-Id: If8264c87078ca5f3d883ecadebc70e435b06ef05
Reviewed-by: Simo Fält <simo.falt@qt.io>
| -rw-r--r-- | coin/platform_configs/installer-framework.yaml | 3 | ||||
| -rw-r--r-- | coin/platform_configs/tqtc-installer-framework.yaml | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index a2e3a823..dc3090e3 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -9,6 +9,9 @@ Configurations: 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'] + QmakeArguments: [ + 'qtdeclarative': '-no-feature-d3d12' + ] - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml index 45577e9a..6672a1b5 100644 --- a/coin/platform_configs/tqtc-installer-framework.yaml +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -10,6 +10,9 @@ Configurations: 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'] + QmakeArguments: [ + 'qtdeclarative': '-no-feature-d3d12' + ] - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' |