Skip to content

Commit 495a20f

Browse files
committed
Platform configurations: Move Android_ANY (clang-x86) to default
Arm targets from default change places with clang-x86 from qt5 Task-number: QTQAINFRA-3153 Change-Id: I642f5c07fd5c36bf675676d82f5f200bce4beccf (cherry picked from commit fa03dbc) Reviewed-by: Tony Sarajärvi <[email protected]>
1 parent d4e3d3c commit 495a20f

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

coin/platform_configs/default.yaml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@
3636
Compiler: 'MSVC2017'
3737
Features: ['Packaging']
3838
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
39+
-
40+
Template: 'qtci-windows-10-x86_64-10'
41+
Target os: 'Android_ANY'
42+
Target arch: 'x86'
43+
Compiler: 'Mingw73'
44+
Target compiler: 'Clang'
45+
Features: ['Packaging', 'DisableTests']
46+
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'
3947
-
4048
Template: 'qtci-linux-Ubuntu-16.04-x86_64-2'
4149
Compiler: 'GCC'
@@ -126,21 +134,21 @@
126134
Features: ['DisableTests']
127135
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
128136
-
129-
Template: 'qtci-linux-RHEL-7.4-x86_64'
137+
Template: 'qtci-macos-10.13-x86_64-2'
130138
Target os: 'Android_ANY'
131-
Target arch: 'armv7'
139+
Target arch: 'x86'
132140
Compiler: 'Clang'
133141
Target compiler: 'Clang'
134142
Features: ['Packaging', 'DisableTests']
135-
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang'
143+
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'
136144
-
137145
Template: 'qtci-linux-RHEL-7.4-x86_64'
138146
Target os: 'Android_ANY'
139-
Target arch: 'arm64'
140-
Compiler: 'Clang'
147+
Target arch: 'x86'
148+
Compiler: 'GCC'
141149
Target compiler: 'Clang'
142150
Features: ['Packaging', 'DisableTests']
143-
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang'
151+
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'
144152
-
145153
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
146154
Target os: 'QEMU'

coin/platform_configs/qt5.yaml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,35 @@
3737
-
3838
Template: 'qtci-linux-RHEL-7.4-x86_64'
3939
Target os: 'Android_ANY'
40-
Target arch: 'x86'
41-
Compiler: 'GCC'
40+
Target arch: 'armv7'
41+
Compiler: 'Clang'
4242
Target compiler: 'Clang'
4343
Features: ['Packaging', 'DisableTests']
44-
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'
44+
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang'
4545
-
46-
Template: 'qtci-windows-10-x86_64-10'
46+
Template: 'qtci-linux-RHEL-7.4-x86_64'
4747
Target os: 'Android_ANY'
48-
Target arch: 'armv7'
49-
Compiler: 'Mingw73'
48+
Target arch: 'arm64'
49+
Compiler: 'Clang'
5050
Target compiler: 'Clang'
5151
Features: ['Packaging', 'DisableTests']
52-
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 armeabi-v7a'
52+
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang'
5353
-
5454
Template: 'qtci-windows-10-x86_64-10'
5555
Target os: 'Android_ANY'
56-
Target arch: 'arm64'
56+
Target arch: 'armv7'
5757
Compiler: 'Mingw73'
5858
Target compiler: 'Clang'
5959
Features: ['Packaging', 'DisableTests']
60-
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 arm64-v8a'
60+
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 armeabi-v7a'
6161
-
6262
Template: 'qtci-windows-10-x86_64-10'
6363
Target os: 'Android_ANY'
64-
Target arch: 'x86'
64+
Target arch: 'arm64'
6565
Compiler: 'Mingw73'
6666
Target compiler: 'Clang'
6767
Features: ['Packaging', 'DisableTests']
68-
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'
68+
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 arm64-v8a'
6969
-
7070
Template: 'qtci-macos-10.13-x86_64-2'
7171
Target os: 'Android_ANY'
@@ -82,14 +82,6 @@
8282
Target compiler: 'Clang'
8383
Features: ['Packaging', 'DisableTests']
8484
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 arm64-v8a'
85-
-
86-
Template: 'qtci-macos-10.13-x86_64-2'
87-
Target os: 'Android_ANY'
88-
Target arch: 'x86'
89-
Compiler: 'Clang'
90-
Target compiler: 'Clang'
91-
Features: ['Packaging', 'DisableTests']
92-
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'
9385
-
9486
Template: 'qtci-macos-10.13-x86_64-2'
9587
Target os: 'QNX_700'

0 commit comments

Comments
 (0)