summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/corelib/kernel/qvariant/CMakeLists.txt11
-rw-r--r--tests/auto/network/access/qnetworkreply/test/CMakeLists.txt5
-rw-r--r--tests/auto/opengl/qgl/CMakeLists.txt13
-rw-r--r--tests/auto/widgets/dialogs/qwizard/CMakeLists.txt16
-rw-r--r--tests/auto/widgets/kernel/qwidget/CMakeLists.txt17
5 files changed, 43 insertions, 19 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
index 2273dafd79..b611bece63 100644
--- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
add_qt_test(tst_qvariant
+ GUI
SOURCES
tst_qvariant.cpp
DEFINES
@@ -16,9 +17,13 @@ add_qt_test(tst_qvariant
)
# Resources:
-add_qt_resource(tst_qvariant "qvariant" FILES
- stream/qt4.9/
- stream/qt5.0/)
+add_qt_resource(tst_qvariant "qvariant"
+ PREFIX
+ "/"
+ FILES
+ stream/qt4.9/
+ stream/qt5.0/
+)
#### Keys ignored in scope 1:.:.:qvariant.pro:<TRUE>:
diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
index df589b67da..ae7a4d0fe0 100644
--- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
@@ -35,7 +35,12 @@ add_qt_test(tst_qnetworkreply
)
# Resources:
+set_source_files_properties("../resource"
+ PROPERTIES alias "resource"
+)
add_qt_resource(tst_qnetworkreply "qnetworkreply"
+ PREFIX
+ "/"
BASE
".."
FILES
diff --git a/tests/auto/opengl/qgl/CMakeLists.txt b/tests/auto/opengl/qgl/CMakeLists.txt
index c259f069a9..5d1ef8bbbf 100644
--- a/tests/auto/opengl/qgl/CMakeLists.txt
+++ b/tests/auto/opengl/qgl/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
add_qt_test(tst_qgl
+ GUI
SOURCES
tst_qgl.cpp
LIBRARIES
@@ -13,7 +14,6 @@ add_qt_test(tst_qgl
Qt::OpenGLPrivate
Qt::WidgetsPrivate
PUBLIC_LIBRARIES
- Qt::Core
Qt::Gui
Qt::OpenGL
Qt::Widgets
@@ -21,9 +21,14 @@ add_qt_test(tst_qgl
# 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)
+ PROPERTIES alias "designer.png"
+)
+add_qt_resource(tst_qgl "qgl"
+ PREFIX
+ "/"
+ FILES
+ ../../gui/image/qpixmap/images/designer.png
+)
#### Keys ignored in scope 1:.:.:qgl.pro:<TRUE>:
diff --git a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
index daefe76139..4f8e9a4a5c 100644
--- a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
@@ -5,19 +5,25 @@
#####################################################################
add_qt_test(tst_qwizard
+ GUI
SOURCES
tst_qwizard.cpp
tst_qwizard_2.cpp
PUBLIC_LIBRARIES
+ Qt::Gui
Qt::Widgets
)
# Resources:
-add_qt_resource(tst_qwizard "qwizard" FILES
- images/background.png
- images/banner.png
- images/logo.png
- images/watermark.png)
+add_qt_resource(tst_qwizard "qwizard"
+ PREFIX
+ "/"
+ FILES
+ images/background.png
+ images/banner.png
+ images/logo.png
+ images/watermark.png
+)
#### Keys ignored in scope 1:.:.:qwizard.pro:<TRUE>:
diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
index 86d02ac733..fca2c313a1 100644
--- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
add_qt_test(tst_qwidget
+ GUI
SOURCES
tst_qwidget.cpp
LIBRARIES
@@ -13,17 +14,19 @@ add_qt_test(tst_qwidget
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)
+add_qt_resource(tst_qwidget "qwidget"
+ PREFIX
+ "/"
+ FILES
+ geometry-fullscreen.dat
+ geometry-maximized.dat
+ geometry.dat
+)
#### Keys ignored in scope 1:.:.:qwidget.pro:<TRUE>:
@@ -33,7 +36,7 @@ add_qt_resource(tst_qwidget "qwidget" FILES
## Scopes:
#####################################################################
-extend_target(tst_qwidget CONDITION APPLE_OSX
+extend_target(tst_qwidget CONDITION APPLE
SOURCES
tst_qwidget_mac_helpers.mm
PUBLIC_LIBRARIES