From 94c9d15355e07113da693f067c1ac15e5f7dc8d7 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 2 May 2019 09:33:45 +0200 Subject: Re-generate CMakeListst for some tests that use .qrc files This way we don't need to run rcc during cmake time Change-Id: Id92111bce6c2b6798f3b18552cea82c8d07c4fc0 Reviewed-by: Simon Hausmann --- .../widgets/dialogs/qfontdialog/CMakeLists.txt | 31 +++++++++++++++++++--- tests/auto/widgets/dialogs/qwizard/CMakeLists.txt | 22 ++++++++++++--- 2 files changed, 47 insertions(+), 6 deletions(-) (limited to 'tests/auto/widgets/dialogs') diff --git a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt index 099fee7a51..58cda26f0a 100644 --- a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt @@ -1,9 +1,34 @@ -add_qt_test("tst_qfontdialog" +# Generated from qfontdialog.pro. + +##################################################################### +## tst_qfontdialog Test: +##################################################################### + +add_qt_test(tst_qfontdialog SOURCES - testfonts.qrc tst_qfontdialog.cpp LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Widgets ) + +# Resources: +set_source_files_properties("../../../shared/resources/test.ttf" + PROPERTIES alias "test.ttf") +set_source_files_properties("../../../shared/resources/testfont.ttf" + PROPERTIES alias "testfont.ttf") +add_qt_resource(tst_qfontdialog "testfonts" PREFIX "/" FILES + ../../../shared/resources/test.ttf + ../../../shared/resources/testfont.ttf) + + +#### Keys ignored in scope 1:.:.:qfontdialog.pro:: +# CONFIG = "testcase" + +## Scopes: +##################################################################### diff --git a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt index 3d88e2cb69..daefe76139 100644 --- a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt @@ -1,8 +1,24 @@ -add_qt_test("tst_qwizard" +# Generated from qwizard.pro. + +##################################################################### +## tst_qwizard Test: +##################################################################### + +add_qt_test(tst_qwizard SOURCES - qwizard.qrc tst_qwizard.cpp tst_qwizard_2.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets ) + +# Resources: +add_qt_resource(tst_qwizard "qwizard" FILES + images/background.png + images/banner.png + images/logo.png + images/watermark.png) + + +#### Keys ignored in scope 1:.:.:qwizard.pro:: +# CONFIG = "testcase" -- cgit v1.2.3