From b2f62bb9062a215dc805fcf5b0dd2119498880e0 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 27 Jan 2020 10:46:07 +0100 Subject: [PATCH] Remove QNX configs from CI Those configurations don't support a C++17 compliant compiler. Fixes: QTBUG-81576 Change-Id: I87499e21e7532856fdd4c41b1e162e3566d5f130 Reviewed-by: Ville Voutilainen --- coin/platform_configs/default.yaml | 7 ----- coin/platform_configs/qt5.yaml | 41 ------------------------------ 2 files changed, 48 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 753578a2..fba4badd 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -114,10 +114,3 @@ Configurations: Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck'] -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'armv7' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 0353b5d2..2c37f1c5 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -25,47 +25,6 @@ Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64' - - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'QNX_700' - Target arch: 'x86' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'QNX_700' - Target arch: 'armv7' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'QNX_700' - Target arch: 'armv8' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'QNX_700' - Target arch: 'x86_64' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'armv8' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'x86_64' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' - Template: 'qtci-windows-10-x86_64-15' Target os: 'WebAssembly'