From 8e7ad4146d55f472e3d1dacaabb6b7dee704a896 Mon Sep 17 00:00:00 2001 From: Igor Cota Date: Sun, 21 Mar 2021 16:48:49 +0100 Subject: depends: disable Qt Vulkan support on Android --- depends/packages/qt.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'depends/packages/qt.mk') diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 0ac6f496c4..100cf3b2e5 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -164,6 +164,7 @@ $(package)_config_opts_android += -no-fontconfig $(package)_config_opts_android += -L $(host_prefix)/lib $(package)_config_opts_android += -I $(host_prefix)/include $(package)_config_opts_android += -pch +$(package)_config_opts_android += -no-feature-vulkan $(package)_config_opts_aarch64_android += -android-arch arm64-v8a $(package)_config_opts_armv7a_android += -android-arch armeabi-v7a -- cgit v1.2.3 From 246774e26459cb3652e308880abdd140e8e9d204 Mon Sep 17 00:00:00 2001 From: Igor Cota Date: Sun, 21 Mar 2021 16:50:25 +0100 Subject: depends: fix Qt precompiled headers bug Fixed in 5.14, see QTBUG-85214 --- depends/packages/qt.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'depends/packages/qt.mk') diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 100cf3b2e5..f853aa0d79 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -9,7 +9,7 @@ $(package)_qt_libs=corelib network widgets gui plugins testlib $(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch $(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch $(package)_patches+= drop_lrelease_dependency.patch no_sdk_version_check.patch -$(package)_patches+= fix_qpainter_non_determinism.patch fix_lib_paths.patch +$(package)_patches+= fix_qpainter_non_determinism.patch fix_lib_paths.patch fix_android_pch.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) $(package)_qttranslations_sha256_hash=e1de58ed108b7e0a138815ea60fd46a2c4e1fc31396a707e5630e92de79c53de @@ -224,6 +224,7 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_android_qmake_conf.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \ + patch -p1 -i $($(package)_patch_dir)/fix_android_pch.patch && \ patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_qpainter_non_determinism.patch &&\ patch -p1 -i $($(package)_patch_dir)/no_sdk_version_check.patch && \ -- cgit v1.2.3