summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/dialogs
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-05-02 09:33:45 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-05-02 07:37:13 +0000
commit94c9d15355e07113da693f067c1ac15e5f7dc8d7 (patch)
tree2fca75579f3c58e008c91c05d538c24ba70cc12b /tests/auto/widgets/dialogs
parentbcfc3dca5d9f3e329fbbcf114145cf8b348c2c81 (diff)
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 <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/widgets/dialogs')
-rw-r--r--tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt31
-rw-r--r--tests/auto/widgets/dialogs/qwizard/CMakeLists.txt22
2 files changed, 47 insertions, 6 deletions
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:<TRUE>:
+# 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:<TRUE>:
+# CONFIG = "testcase"