diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-09 13:07:26 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-17 17:30:14 +0200 |
| commit | 7a4b586f4b8d1b73d1af3d24ff5112e4dc231ea6 (patch) | |
| tree | fddc569efaeeb8147b80c0d7c3aae60f5c623fd7 /tests/auto/gui/image | |
| parent | d8fd2425fb37b5f745e385552b11dc4cdcffb5ff (diff) | |
Remove conditioning on Android embedded
It is no longer handled separately from Android.
This effectively reverts commit 6d50f746fe05a7008b63818e77784dd0c99270a1
Change-Id: Ic2d75b8c5a09895810913311ab2fe3355d4d2983
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'tests/auto/gui/image')
| -rw-r--r-- | tests/auto/gui/image/qimage/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/gui/image/qimagereader/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/gui/image/qimagewriter/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt index 85f3fd1c76..4c95b32e48 100644 --- a/tests/auto/gui/image/qimage/CMakeLists.txt +++ b/tests/auto/gui/image/qimage/CMakeLists.txt @@ -23,7 +23,7 @@ qt_internal_add_test(tst_qimage ## Scopes: ##################################################################### -if(ANDROID AND NOT ANDROID_EMBEDDED) +if(ANDROID) # Resources: set(qimage_resource_files "images/image.bmp" diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt index dd15618370..a0cda3bb73 100644 --- a/tests/auto/gui/image/qimagereader/CMakeLists.txt +++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt @@ -49,7 +49,7 @@ qt_internal_add_resource(tst_qimagereader "qmake_immediate" ## Scopes: ##################################################################### -if(ANDROID AND NOT ANDROID_EMBEDDED) +if(ANDROID) # Resources: set(android_testdata_resource_files "images/kollada-noext" diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt index f7212eca3e..e74321731f 100644 --- a/tests/auto/gui/image/qimagewriter/CMakeLists.txt +++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt @@ -24,7 +24,7 @@ qt_internal_add_test(tst_qimagewriter ## Scopes: ##################################################################### -if(ANDROID AND NOT ANDROID_EMBEDDED) +if(ANDROID) # Resources: set(qimagewriter_resource_files "images/YCbCr_cmyk.jpg" |