Merge remote-tracking branch 'remotes/origin/qt6-github-actions' into qmake-to-cmake-migration

This commit is contained in:
vladimir.kuznetsov 2022-12-01 20:05:36 +03:00
commit 2a80117d42
4 changed files with 275 additions and 3 deletions

View file

@ -8,7 +8,7 @@ TEMPLATE = app
IS_CI=$$(CI)
!isEmpty(IS_CI){
message("Detected CI env")
CONFIG += silent ccache
CONFIG += silent #ccache
}
CONFIG += qtquickcompiler
@ -248,6 +248,9 @@ android {
# As QAndroidBinder is not yet implemented with a public api
QT+=core-private
ANDROID_ABIS=ANDROID_TARGET_ARCH
# for not changing qtkeychain sources for qt6
QT -= androidextras
}
else {
QT += androidextras