From 30917cd20ce1e40482e967fdafb5f8b95a62b640 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 14 Oct 2019 18:33:07 +0200
Subject: Regenerate required projects after dev -> wip/cmake merge

Change-Id: Ic5f1909731ec11b4fb6bc8823506d272c529ecfb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 tests/auto/quick/qquickdroparea/CMakeLists.txt | 29 ++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'tests/auto/quick/qquickdroparea')

diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt
index 083a08cf10..ea66f99c0c 100644
--- a/tests/auto/quick/qquickdroparea/CMakeLists.txt
+++ b/tests/auto/quick/qquickdroparea/CMakeLists.txt
@@ -4,10 +4,23 @@
 ## tst_qquickdroparea Test:
 #####################################################################
 
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 add_qt_test(tst_qquickdroparea
-    GUI
     SOURCES
+        ../../shared/util.cpp ../../shared/util.h
+        ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
+        ../shared/viewtestutil.cpp ../shared/viewtestutil.h
+        ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickdroparea.cpp
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+    INCLUDE_DIRECTORIES
+        ../../shared
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
@@ -18,13 +31,21 @@ add_qt_test(tst_qquickdroparea
         Qt::Network
         Qt::Qml
         Qt::Quick
+    TESTDATA ${test_data}
 )
 
 #### Keys ignored in scope 1:.:.:qquickdroparea.pro:<TRUE>:
-# CONFIG = "testcase"
+# OTHER_FILES = "data/*.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickdroparea.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
+extend_target(tst_qquickdroparea CONDITION ANDROID OR APPLE_IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT APPLE_IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
-- 
cgit v1.2.3