From 6928140325f972c00de7acd421714d15c7fd155f Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 23 Sep 2020 10:21:04 +0200 Subject: [PATCH] Update qtwebengine.yaml Based on default with a few unsupported platforms removed Change-Id: I8edfa83f3cc09172c041e8dd6adaf96666d0238d Reviewed-by: Alexandru Croitor --- coin/platform_configs/qtwebengine.yaml | 29 ++++++++------------------ 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index f938bc94..2a43a3e5 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -9,13 +9,18 @@ Configurations: - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' - Features: ['UseLegacyInstructions'] + 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' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' - Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions'] + 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' +- + Template: 'qtci-linux-SLES-15-x86_64' + Compiler: 'GCC' + Features: ['DisableTests', 'UseLegacyInstructions'] + 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' @@ -38,20 +43,12 @@ Configurations: Compiler: 'Clang' Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'GCC' - Target compiler: 'Clang' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r21d -android-ndk-host linux-x86_64' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Features: ['UseLegacyInstructions'] + Features: ['UseLegacyInstructions', 'Insignificant'] Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - @@ -59,17 +56,9 @@ Configurations: Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' - Features: ['UseLegacyInstructions'] + Features: ['UseLegacyInstructions', 'Insignificant'] Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Target os: 'QEMU' - Target arch: 'mips64' - Compiler: 'GCC' - Features: ['DisableTests', 'UseLegacyInstructions'] - Environment variables: ['QT_QUICK_BACKEND=software'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC'