diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-02-24 14:54:22 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-02-24 15:54:25 +0200 |
| commit | 7fc20312129da64b22f63d9401c1e65b1eb846da (patch) | |
| tree | eea74033a100279c925fe7191de0c8d215d27d82 | |
| parent | a3ee8d931b85244d7ad640caed4304cdf5dfebfe (diff) | |
Drop failing qmake builds from Android
We are not supporting to build Qt 6.0 with qmake so it is better to
drop these failing targets instead of wasting time to fix the regression.
These targets are already dropped from newer releases so it is OK to
drop them from Qt 6.0 as well
Fixes: QTBUG-91356
Change-Id: Id5cd4c9758ea7375aca72d23b4aa648e8479869d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | coin/platform_configs/default.yaml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 9417bdee..4b48cb27 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -54,14 +54,6 @@ Configurations: Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -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: '-qmake -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-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'armv7' @@ -92,15 +84,6 @@ Configurations: Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -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-52' - 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: '-qmake -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'] |