From 61c4be2c0b4d2dc2759e26919bd43dfca76183bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 19 Jun 2018 15:15:43 +0300 Subject: Add Android arm64 targets Task-number: QTQAINFRA-2078 Change-Id: Icbc4fa27932e2a53d43bf1c72ddd2091f2801e5c Reviewed-by: BogDan Vatra Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 1 + coin/platform_configs/qt5.txt | 2 ++ 2 files changed, 3 insertions(+) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index eb9e6fac..e5c9c648 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -19,6 +19,7 @@ qtci-macos-10.13-x86_64 IOS_ANY multi Clang qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index f074aea7..781989cd 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -9,8 +9,10 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -- cgit v1.2.3