diff options
| author | Robert Löhning <robert.loehning@qt.io> | 2024-05-06 20:51:08 +0200 |
|---|---|---|
| committer | Robert Löhning <robert.loehning@qt.io> | 2024-05-07 13:10:04 +0200 |
| commit | 9ec3591cc06bb5ab262faea80cbf85653101bc36 (patch) | |
| tree | 8c4c4208dde741f2e7eab1ca776f09da312f915b | |
| parent | 204453a49da505b2a1dafa1636091be134b43657 (diff) | |
Build more autotests when configured with -no-widgets
Change-Id: I72d1815634b9e45ed71ea23927f0b03349831186
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io>
| -rw-r--r-- | tests/auto/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tests/auto/qsvggenerator/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/qsvggenerator/tst_qsvggenerator.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qsvgplugin/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/qsvgrenderer/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp | 2 |
6 files changed, 8 insertions, 11 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 621922b..f1e213e 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -13,12 +13,12 @@ endif() if(TARGET Qt::Widgets) add_subdirectory(qsvgdevice) - if(TARGET Qt::Xml) - add_subdirectory(qsvggenerator) - endif() - add_subdirectory(qsvgplugin) - add_subdirectory(qicon_svg) endif() -if(TARGET Qt::Widgets AND NOT ANDROID) +if(TARGET Qt::Xml) + add_subdirectory(qsvggenerator) +endif() +add_subdirectory(qsvgplugin) +add_subdirectory(qicon_svg) +if(NOT ANDROID) add_subdirectory(qsvgrenderer) endif() diff --git a/tests/auto/qsvggenerator/CMakeLists.txt b/tests/auto/qsvggenerator/CMakeLists.txt index 19bd1b9..7866cf2 100644 --- a/tests/auto/qsvggenerator/CMakeLists.txt +++ b/tests/auto/qsvggenerator/CMakeLists.txt @@ -18,7 +18,6 @@ qt_internal_add_test(tst_qsvggenerator Qt::Gui Qt::GuiPrivate Qt::Svg - Qt::Widgets Qt::Xml ) diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp index e660b89..f6d68bf 100644 --- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp +++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp @@ -8,7 +8,7 @@ #include <QDomElement> #include <QDomNode> -#include <qapplication.h> +#include <qguiapplication.h> #include <qdebug.h> #include <qpainter.h> #include <qsvggenerator.h> diff --git a/tests/auto/qsvgplugin/CMakeLists.txt b/tests/auto/qsvgplugin/CMakeLists.txt index e9a516c..df09530 100644 --- a/tests/auto/qsvgplugin/CMakeLists.txt +++ b/tests/auto/qsvgplugin/CMakeLists.txt @@ -18,7 +18,6 @@ qt_internal_add_test(tst_qsvgplugin Qt::Gui Qt::GuiPrivate Qt::SvgPrivate - Qt::Widgets ) # Resources: diff --git a/tests/auto/qsvgrenderer/CMakeLists.txt b/tests/auto/qsvgrenderer/CMakeLists.txt index 4787637..4103fd9 100644 --- a/tests/auto/qsvgrenderer/CMakeLists.txt +++ b/tests/auto/qsvgrenderer/CMakeLists.txt @@ -20,7 +20,6 @@ qt_internal_add_test(tst_qsvgrenderer Qt::Gui Qt::GuiPrivate Qt::Svg - Qt::Widgets ) # Resources: diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp index a77a87a..2c8368b 100644 --- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp +++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp @@ -4,7 +4,7 @@ #include <QtTest/QtTest> -#include <qapplication.h> +#include <qguiapplication.h> #include <qdebug.h> #include <qsvgrenderer.h> #include <qsvggenerator.h> |