aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-04-09 14:38:16 +0300
committerJani Heikkinen <jani.heikkinen@qt.io>2021-04-13 05:12:29 +0000
commit60d0c79ca85fc74ab511842c8ec4593d4de7c029 (patch)
treef4347ed2ec27b7d4788af3f454b416f592115a96
parenta2a13dcb95636c3fb48ae2e37b25d695a740ba48 (diff)
Drop Ubuntu 18.04 target from qtbase.yaml as well
Change-Id: I033d8aa10b69a110fb1f51fd0620deba7ac559a9 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 9980240e33fbfc6468fbf3c578cf8294451d4589) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 7722922b17f67af1260dc64bb17789aff86e6664) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rw-r--r--coin/platform_configs/qtbase.yaml11
1 files changed, 0 insertions, 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']