From 94c9d15355e07113da693f067c1ac15e5f7dc8d7 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
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 <simon.hausmann@qt.io>
---
 tests/auto/opengl/qgl/CMakeLists.txt               | 31 +++++++++++++--
 .../widgets/dialogs/qfontdialog/CMakeLists.txt     | 31 +++++++++++++--
 tests/auto/widgets/dialogs/qwizard/CMakeLists.txt  | 22 +++++++++--
 tests/auto/widgets/kernel/qwidget/CMakeLists.txt   | 46 ++++++++++++++++++----
 4 files changed, 113 insertions(+), 17 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/opengl/qgl/CMakeLists.txt b/tests/auto/opengl/qgl/CMakeLists.txt
index 77c0afca75..c259f069a9 100644
--- a/tests/auto/opengl/qgl/CMakeLists.txt
+++ b/tests/auto/opengl/qgl/CMakeLists.txt
@@ -1,7 +1,30 @@
-add_qt_test("tst_qgl" SOURCES qgl.qrc tst_qgl.cpp
+# Generated from qgl.pro.
+
+#####################################################################
+## tst_qgl Test:
+#####################################################################
+
+add_qt_test(tst_qgl
+    SOURCES
+        tst_qgl.cpp
     LIBRARIES
-        Qt::WidgetsPrivate
-        Qt::OpenGLPrivate
-        Qt::GuiPrivate
         Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::OpenGLPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::OpenGL
+        Qt::Widgets
 )
+
+# Resources:
+set_source_files_properties("../../gui/image/qpixmap/images/designer.png"
+    PROPERTIES alias "designer.png")
+add_qt_resource(tst_qgl "qgl" FILES
+    ../../gui/image/qpixmap/images/designer.png)
+
+
+#### Keys ignored in scope 1:.:.:qgl.pro:<TRUE>:
+# CONFIG = "testcase"
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"
diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
index 3bafe782d6..86d02ac733 100644
--- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
@@ -1,16 +1,48 @@
-add_qt_test("tst_qwidget"
+# Generated from qwidget.pro.
+
+#####################################################################
+## tst_qwidget Test:
+#####################################################################
+
+add_qt_test(tst_qwidget
     SOURCES
-        qwidget.qrc
         tst_qwidget.cpp
     LIBRARIES
-        Qt::Widgets
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::WidgetsPrivate
         Qt::TestPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+# Resources:
+add_qt_resource(tst_qwidget "qwidget" FILES
+    geometry-fullscreen.dat
+    geometry-maximized.dat
+    geometry.dat)
+
+
+#### Keys ignored in scope 1:.:.:qwidget.pro:<TRUE>:
+# CONFIG = "testcase" "x11inc"
+# testcase.timeout = "600"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qwidget CONDITION APPLE_OSX
+    SOURCES
+        tst_qwidget_mac_helpers.mm
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWSecurity}
 )
 
-extend_target("tst_qwidget" CONDITION APPLE_OSX
-    SOURCES tst_qwidget_mac_helpers.mm
-    LIBRARIES ${FWSecurity} ${FWAppKit}
+extend_target(tst_qwidget CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        gdi32
+        user32
 )
-- 
cgit v1.2.3