diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-28 20:28:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-28 20:28:11 +0200 |
| commit | f58935ebea9f457a05839240755b032da1144d7a (patch) | |
| tree | a18a1db249327c702109352230bbfa811a8f8789 /coin/platform_configs | |
| parent | 097b013183e1090e6b28691136ac7d7b5bfc574e (diff) | |
| parent | 163bd8006e32184ad77654dd36d3cba417c65028 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
coin/platform_configs/default.yaml
coin/provisioning/common/linux/disable-ntp_linux.sh
coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh
coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh
emsdk.sh was moved from linux to unix, see
38e416be664dc216b332e6b4ff8d38905dfdc1e9
Change-Id: I5b06dde2860a4e4869960ae2a5be1d6a1396e957
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.yaml | 12 | ||||
| -rw-r--r-- | coin/platform_configs/qtsaferenderer.yaml | 7 |
2 files changed, 15 insertions, 4 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index b566f66a..b5a53ed9 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -77,10 +77,20 @@ Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten' - + Template: 'qtci-linux-SLES-12-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-SLES-15-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index cc0c29d7..cb4d6abf 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -5,9 +5,10 @@ - Template: 'qtci-windows-10-x86_64-14' Compiler: 'Mingw73' - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-fontconfig -qt-freetype -qt-libpng' |