From fdf5d11ff6f3f5034d7d7f7664f4cc76deb26ef5 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 9 Feb 2022 16:24:24 +0100 Subject: CMake: Add BUILTIN_TESTDATA option to qt_internal_add_test Multiple tests use qt_internal_add_resource that copies the functionality that is already implemented inside the qt_internal_add_test function. Simplify these test by replacing the qt_internal_add_resource call with the new BUILTIN_TESTDATA option. Change-Id: I18475b817d6f87264f0de53817d6c26c5ccab4e2 Reviewed-by: Alexandru Croitor --- tests/auto/widgets/kernel/qwidget/CMakeLists.txt | 26 +++++++++--------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'tests/auto/widgets/kernel/qwidget') diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt index d04db40e87..e2370a011a 100644 --- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt @@ -4,6 +4,14 @@ ## tst_qwidget Test: ##################################################################### +# Resources: +set(qwidget_resource_files + "geometry-fullscreen.dat" + "geometry-maximized.dat" + "geometry.dat" + "hellotr_la.qm" +) + qt_internal_add_test(tst_qwidget SOURCES tst_qwidget.cpp @@ -14,24 +22,10 @@ qt_internal_add_test(tst_qwidget Qt::TestPrivate Qt::Widgets Qt::WidgetsPrivate + TESTDATA ${qwidget_resource_files} + BUILTIN_TESTDATA ) -# Resources: -set(qwidget_resource_files - "geometry-fullscreen.dat" - "geometry-maximized.dat" - "geometry.dat" - "hellotr_la.qm" -) - -qt_internal_add_resource(tst_qwidget "qwidget" - PREFIX - "/" - FILES - ${qwidget_resource_files} -) - - #### Keys ignored in scope 1:.:.:qwidget.pro:: # testcase.timeout = "600" -- cgit v1.2.3