From 6ec71c345a28bff77ed4c430422dd410b3aeec48 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 12 Aug 2020 14:11:35 +0300 Subject: Provisioning: Use system OpenSSL in linux instead of self built version Task-number: QTQAINFRA-3863 Change-Id: I98fc2d787956bb23d2e50b618fdae0a094e4eeed Reviewed-by: Toni Saario --- coin/platform_configs/qtwebengine.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin/platform_configs/qtwebengine.yaml') diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index 7a3b8752..c5f5be2b 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -10,12 +10,12 @@ Configurations: Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['UseLegacyInstructions', 'Insignificant'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions', 'Insignificant'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl' - Template: 'qtci-linux-SLES-15-x86_64' Compiler: 'GCC' @@ -25,7 +25,7 @@ Configurations: Template: 'qtci-linux-CentOS-8.1-x86_64-50' Compiler: 'GCC' Features: ['UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz -R . QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' -- cgit v1.2.3