diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-25 13:14:00 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-25 21:08:10 +0000 |
| commit | 97b914b3e7410ee013ab50680210309524960f55 (patch) | |
| tree | e8037e8216246969e629b66901a918dd65b4aa80 /tests/auto/other/android | |
| parent | c7dec2faca476c94a40bd4ac5118915b1a5d9aa8 (diff) | |
Android: fix tst_android test
Fixes: QTBUG-88506
Pick-to: 6.0
Change-Id: I938de388fce8ec393b03b2f0f42ddfe9094e6a5e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/other/android')
| -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>: |