diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-20 16:46:56 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-20 20:00:00 +0200 |
| commit | 94d91d2a6aae7d372cd192bb0d15c4ebf3d7ba7e (patch) | |
| tree | 83c273c48a6b4fe85a573883a6b7a064b65fa354 | |
| parent | 90a6ab728ff2cf99237f75248f1ec75c5b0b03cc (diff) | |
Move rest of qt5.yaml platform configs to default.yaml
Change-Id: Ica5f3e6875caccd0553ce5a8376bcf30e7f953ad
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | coin/platform_configs/default.yaml | 15 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.yaml | 17 |
2 files changed, 16 insertions, 16 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index f79cf3db..6c51c51f 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -86,6 +86,21 @@ Configurations: Environment variables: ['QT_QUICK_BACKEND=software'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors' - + Template: 'qtci-windows-10-x86_64-51' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] + Features: ['DisableTests', 'UseLegacyInstructions'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -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% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' +- + Template: 'qtci-windows-10-x86_64-51' + Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] + Target compiler: 'Clang' + Features: ['DisableTests', 'UseLegacyInstructions'] + 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-r21d' +- Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index d1e6cba9..c3233842 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,18 +1,3 @@ Version: 2 Include: [cmake_platforms.yaml] -Configurations: -- - Template: 'qtci-windows-10-x86_64-51' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -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% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' -- - Template: 'qtci-windows-10-x86_64-51' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] - Target compiler: 'Clang' - Features: ['DisableTests', 'UseLegacyInstructions'] - 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-r21d' +Configurations: [] |