From 91e32f86b53bb930405a58e19c84746ee85cdf89 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Thu, 14 Nov 2019 11:39:42 +0100
Subject: Regenerate remaining tests to be in sync

Change-Id: I200c8f58ad13bc1bc78409a3ce49348584ba5b51
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 tests/auto/qml/qqmlmetatype/CMakeLists.txt | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'tests/auto/qml/qqmlmetatype')

diff --git a/tests/auto/qml/qqmlmetatype/CMakeLists.txt b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
index 0f96747410..38d3034509 100644
--- a/tests/auto/qml/qqmlmetatype/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qqmlmetatype
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlmetatype.cpp
@@ -30,31 +27,33 @@ add_qt_test(tst_qqmlmetatype
 )
 
 # Resources:
+set(qmake_qmlfiles_resource_files
+    "data/CompositeType.qml"
+)
+
 add_qt_resource(tst_qqmlmetatype "qmake_qmlfiles"
     PREFIX
         "/tstqqmlmetatype"
     FILES
-        data/CompositeType.qml
+        ${qmake_qmlfiles_resource_files}
+)
+set(qmake_qmldirresource_resource_files
+    "data/Components/App.qml"
+    "data/Components/qmldir"
+    "data/enumsInRecursiveImport.qml"
 )
+
 add_qt_resource(tst_qqmlmetatype "qmake_qmldirresource"
     PREFIX
         "/"
     FILES
-        data/Components/App.qml
-        data/Components/qmldir
-        data/enumsInRecursiveImport.qml
+        ${qmake_qmldirresource_resource_files}
 )
 
 
-#### Keys ignored in scope 1:.:.:qqmlmetatype.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qqmlmetatype.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qqmlmetatype CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
-- 
cgit v1.2.3