From 60d0c79ca85fc74ab511842c8ec4593d4de7c029 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Fri, 9 Apr 2021 14:38:16 +0300 Subject: Drop Ubuntu 18.04 target from qtbase.yaml as well Change-Id: I033d8aa10b69a110fb1f51fd0620deba7ac559a9 Reviewed-by: Toni Saario (cherry picked from commit 9980240e33fbfc6468fbf3c578cf8294451d4589) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 7722922b17f67af1260dc64bb17789aff86e6664) Reviewed-by: Heikki Halmet --- coin/platform_configs/qtbase.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 8b3df2cd..1493629a 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -15,14 +15,3 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'Ubuntu-18.04-host' - Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'InsignificantTests'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] -- cgit v1.2.3