From 97b914b3e7410ee013ab50680210309524960f55 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 25 Nov 2020 13:14:00 +0200 Subject: Android: fix tst_android test Fixes: QTBUG-88506 Pick-to: 6.0 Change-Id: I938de388fce8ec393b03b2f0f42ddfe9094e6a5e Reviewed-by: Alexandru Croitor --- tests/auto/other/android/BLACKLIST | 3 --- tests/auto/other/android/CMakeLists.txt | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 tests/auto/other/android/BLACKLIST (limited to 'tests/auto/other') diff --git a/tests/auto/other/android/BLACKLIST b/tests/auto/other/android/BLACKLIST deleted file mode 100644 index 316fb368a8..0000000000 --- a/tests/auto/other/android/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -# QTBUG-88506 -[assetsRead] -android diff --git a/tests/auto/other/android/CMakeLists.txt b/tests/auto/other/android/CMakeLists.txt index d58103679b..c2749825ac 100644 --- a/tests/auto/other/android/CMakeLists.txt +++ b/tests/auto/other/android/CMakeLists.txt @@ -13,6 +13,8 @@ if(ANDROID) set_property(TARGET tst_android APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/testdata ) + # QTBUG-88840 # special case + qt_android_generate_deployment_settings(tst_android) # special case endif() #### Keys ignored in scope 1:.:.:android.pro:: -- cgit v1.2.3