diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-25 13:14:00 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-26 00:01:05 +0000 |
| commit | 8a425518809d6e9d3102487b4fa55a7deba15802 (patch) | |
| tree | b908fc832423c241f4b5fee2a601c2ab855de687 /tests | |
| parent | 67bdcb059a3c9335abd04c31b3546f7541b00933 (diff) | |
Android: fix tst_android test
Fixes: QTBUG-88506
Change-Id: I938de388fce8ec393b03b2f0f42ddfe9094e6a5e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 97b914b3e7410ee013ab50680210309524960f55)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/other/android/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/other/android/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 3 deletions
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:<TRUE>: |