From 7a4b586f4b8d1b73d1af3d24ff5112e4dc231ea6 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 9 Sep 2021 13:07:26 +0200 Subject: 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 --- tests/auto/gui/image/qimage/CMakeLists.txt | 2 +- tests/auto/gui/image/qimagereader/CMakeLists.txt | 2 +- tests/auto/gui/image/qimagewriter/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/gui/image') 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" -- cgit v1.2.3