lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-28 15:46:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ifw-5.12.10' into ifw-5.12.11

Browse Source 
Task-number: QTIFW-2130
Change-Id: I3c045c06262547fc226e563c0e861d9aa855de18
This commit is contained in:
Simo Fält
2021-10-05 14:01:39 +03:00
parent fce0a78067 0253936025
commit 6a0591da9a
14 changed files with 313 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
coin/platform_configs/installer-framework.yaml
View File

@@ -5,25 +5,23 @@ Configurations:
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2015'
Target arch: 'x86'
Features: ['Packaging', 'DisableTests']
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;']
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']
QmakeArguments: [
'qtdeclarative': '-no-feature-d3d12'
]
-
Template: 'qtci-macos-10.13-x86_64-3'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']
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'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -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', 'DisableTests']
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'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -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-Ubuntu-18.04-x86_64'
Compiler: 'GCC'