summaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/qt5.yaml
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2019-08-12 12:43:57 +0300
committerLiang Qi <liang.qi@qt.io>2019-08-13 22:11:31 +0000
commit4175af18f8a56c8e9a372c28a8d800488f9f8a18 (patch)
tree627ac0741c168d1b2f8963dedf183ff2c513d3da /coin/platform_configs/qt5.yaml
parentd19f60d7458a295c4abf36aef1332184c7de41bf (diff)
Add Android x86_64 architecture
It seems those build targets were accidentally deleted when yaml change was merged in. Targets were there in Qt 5.13.0 release (before yaml change) This amends a94696ccd5be936099809eda58db02999cb7c77a. See also ebcfcbe69a5d34949d938211c364e1ff6f185b39. Task-number: QTBUG-47672 Change-Id: If2c22a8b995fdaa967f81062d0fae6dc725829dd Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'coin/platform_configs/qt5.yaml')
-rw-r--r--coin/platform_configs/qt5.yaml24
1 files changed, 24 insertions, 0 deletions
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index 69f1c7e3..87b2c4c1 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -43,6 +43,14 @@
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86'
-
+ Template: 'qtci-linux-RHEL-7.6-x86_64'
+ Target os: 'Android_ANY'
+ Target arch: 'x86_64'
+ Compiler: 'GCC'
+ Target compiler: 'Clang'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86_64'
+-
Template: 'qtci-windows-10-x86_64-14'
Target os: 'Android_ANY'
Target arch: 'armv7'
@@ -67,6 +75,14 @@
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86'
-
+ Template: 'qtci-windows-10-x86_64-14'
+ Target os: 'Android_ANY'
+ Target arch: 'x86_64'
+ Compiler: 'Mingw73'
+ Target compiler: 'Clang'
+ Features: ['Packaging', 'DisableTests']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86_64'
+-
Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'Android_ANY'
Target arch: 'armv7'
@@ -92,6 +108,14 @@
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-r19c -android-ndk-host darwin-x86_64 -android-arch x86'
-
Template: 'qtci-macos-10.13-x86_64-2'
+ Target os: 'Android_ANY'
+ Target arch: 'x86_64'
+ Compiler: 'Clang'
+ Target compiler: 'Clang'
+ 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-r19c -android-ndk-host darwin-x86_64 -android-arch x86_64'
+-
+ Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'QNX_700'
Target arch: 'x86'
Compiler: 'GCC'