1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: fix tst_android test

Browse Source 
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>
This commit is contained in:
Assam Boudjelthia 2020-11-25 13:14:00 +02:00 committed by Qt Cherry-pick Bot
parent 67bdcb059a
commit 8a42551880
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/other/android/BLACKLIST
View File

@ -1,3 +0,0 @@
# QTBUG-88506
[assetsRead]
android

2
tests/auto/other/android/CMakeLists.txt
View File

@ -13,6 +13,8 @@ if(ANDROID)
set_property(TARGET tst_android APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR set_property(TARGET tst_android APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
${CMAKE_CURRENT_SOURCE_DIR}/testdata ${CMAKE_CURRENT_SOURCE_DIR}/testdata
) )
# QTBUG-88840 # special case
qt_android_generate_deployment_settings(tst_android) # special case
endif() endif()
#### Keys ignored in scope 1:.:.:android.pro:<TRUE>: #### Keys ignored in scope 1:.:.:android.pro:<TRUE>: