From 4c4bc9352da2a873c3dedb9521789c1bd019cc29 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 17 Sep 2020 12:34:29 +0200 Subject: [PATCH] Re-add macOS host Android target qmake configuration Partially reverts 37cb787dc10e8ce666e610ef7112714938f78827 Change-Id: Ida0d4095502ffc219cc290e3247b3dfb57dbd4bb Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 45b2c437..e63b267f 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -48,6 +48,14 @@ 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-macos-10.14-x86_64' + Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['DisableTests', 'UseLegacyInstructions'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -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-r21d -android-ndk-host darwin-x86_64' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY'