From 76590ce2208e754f87e5b75c0c1de425c34e0b1a Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 12 Nov 2019 11:53:30 +0100
Subject: Regenerate tests/auto/corelib/io

Change-Id: Ic1d1b5c0deb90800c7219fb8cce4e77e0db145b8
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
---
 tests/auto/corelib/io/qdir/CMakeLists.txt | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'tests/auto/corelib/io/qdir')

diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt
index 89c79c314c..6ac1e5b46f 100644
--- a/tests/auto/corelib/io/qdir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdir/CMakeLists.txt
@@ -14,7 +14,6 @@ list(APPEND test_data "types")
 list(APPEND test_data "tst_qdir.cpp")
 
 add_qt_test(tst_qdir
-    GUI
     SOURCES
         tst_qdir.cpp
     LIBRARIES
@@ -23,11 +22,15 @@ add_qt_test(tst_qdir
 )
 
 # Resources:
+set(qdir_resource_files
+    "resources/entryList/"
+)
+
 add_qt_resource(tst_qdir "qdir"
     PREFIX
         "/tst_qdir/"
     FILES
-        "resources/entryList/"
+        ${qdir_resource_files}
 )
 
 
@@ -42,11 +45,9 @@ extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
         BUILTIN_TESTDATA
 )
 
-# Resources:
-add_qt_resource(tst_qdir "android_testdata"
-    PREFIX
-        "/android_testdata"
-    FILES
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(android_testdata_resource_files
         "entrylist/directory/dummy"
         "entrylist/file"
         "resources/entryList/file1.data"
@@ -87,5 +88,12 @@ add_qt_resource(tst_qdir "android_testdata"
         "types/f.b/dummy"
         "types/f.c/dummy"
         "types/f/dummy"
-)
+    )
 
+    add_qt_resource(tst_qdir "android_testdata"
+        PREFIX
+            "/android_testdata"
+        FILES
+            ${android_testdata_resource_files}
+    )
+endif()
-- 
cgit v1.2.3