diff options
| author | Simo Fält <simo.falt@qt.io> | 2020-11-17 09:57:35 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2021-03-03 09:03:55 +0200 |
| commit | 5770eaaa52cb47484a2fcbb45c107e55c876f68b (patch) | |
| tree | 2e929a84ed88cd0dcf5ad4d8ef2c741c1a9c134c | |
| parent | 12b090a24c31a434455de4e80809501e4e7bd33f (diff) | |
Fix tqtc-installer-framework platform configs
Change-Id: Ib5625c56507d2331e75b97a3757e0930cdee06a2
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit 53680499c8d29a4a4fde5823a936f882b27333c0)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| -rw-r--r-- | coin/platform_configs/tqtc-installer-framework.yaml | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml index 259d89b6..3ff2dea7 100644 --- a/coin/platform_configs/tqtc-installer-framework.yaml +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -1,31 +1,9 @@ Version: 2 Module only: True +Include: [ installer-framework.yaml ] Configurations: - - Template: 'qtci-windows-10-x86_64-10' - Compiler: 'MSVC2015' - Target arch: 'x86' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' - Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] - Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] -- - Template: 'qtci-macos-10.13-x86_64-2' - Compiler: 'Clang' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Compiler: 'GCC' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Compiler: 'GCC' - Features: ['Documentation', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -qt-zlib -qt-libpng -qt-libjpeg -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-windows-10-x86_64-10' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging', 'QtInstaller'] |