diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 10:16:58 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-23 16:59:06 +0200 |
commit | 403213240c7b2dc09378e1cb8c147131e368f90c (patch) | |
tree | ff86910332629fe5e2fab59a30fb863a5febb366 /tests/auto/gui/painting | |
parent | e0c62a48b8a826a46a143e57e94b2a0ea73c7cae (diff) |
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well.
Clean up some stale .prev files that are not needed anymore.
Clean up some project files that are not used anymore.
Task-number: QTBUG-86815
Change-Id: I9947da921f98686023c6bb053dfcc101851276b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/gui/painting')
16 files changed, 22 insertions, 22 deletions
diff --git a/tests/auto/gui/painting/qbrush/CMakeLists.txt b/tests/auto/gui/painting/qbrush/CMakeLists.txt index 64659bb07e..c8dad25d94 100644 --- a/tests/auto/gui/painting/qbrush/CMakeLists.txt +++ b/tests/auto/gui/painting/qbrush/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbrush Test: ##################################################################### -qt_add_test(tst_qbrush +qt_internal_add_test(tst_qbrush SOURCES tst_qbrush.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qcolor/CMakeLists.txt b/tests/auto/gui/painting/qcolor/CMakeLists.txt index 0baa27ac11..87753803fb 100644 --- a/tests/auto/gui/painting/qcolor/CMakeLists.txt +++ b/tests/auto/gui/painting/qcolor/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcolor Test: ##################################################################### -qt_add_test(tst_qcolor +qt_internal_add_test(tst_qcolor SOURCES tst_qcolor.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qcolorspace/CMakeLists.txt b/tests/auto/gui/painting/qcolorspace/CMakeLists.txt index ad719f3bca..9e3460d363 100644 --- a/tests/auto/gui/painting/qcolorspace/CMakeLists.txt +++ b/tests/auto/gui/painting/qcolorspace/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob resources/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qcolorspace +qt_internal_add_test(tst_qcolorspace SOURCES tst_qcolorspace.cpp PUBLIC_LIBRARIES @@ -30,7 +30,7 @@ set(qmake_immediate_resource_files ${resource_glob_0} ) -qt_add_resource(tst_qcolorspace "qmake_immediate" +qt_internal_add_resource(tst_qcolorspace "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/gui/painting/qpagelayout/CMakeLists.txt b/tests/auto/gui/painting/qpagelayout/CMakeLists.txt index 15ffd4a000..913619461e 100644 --- a/tests/auto/gui/painting/qpagelayout/CMakeLists.txt +++ b/tests/auto/gui/painting/qpagelayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpagelayout Test: ##################################################################### -qt_add_test(tst_qpagelayout +qt_internal_add_test(tst_qpagelayout SOURCES tst_qpagelayout.cpp DEFINES diff --git a/tests/auto/gui/painting/qpagesize/CMakeLists.txt b/tests/auto/gui/painting/qpagesize/CMakeLists.txt index 706fa3e402..fc6fd931c2 100644 --- a/tests/auto/gui/painting/qpagesize/CMakeLists.txt +++ b/tests/auto/gui/painting/qpagesize/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpagesize Test: ##################################################################### -qt_add_test(tst_qpagesize +qt_internal_add_test(tst_qpagesize SOURCES tst_qpagesize.cpp DEFINES diff --git a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt index 602bfe7316..b843135645 100644 --- a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt +++ b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpaintengine Test: ##################################################################### -qt_add_test(tst_qpaintengine +qt_internal_add_test(tst_qpaintengine SOURCES tst_qpaintengine.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qpainter/CMakeLists.txt b/tests/auto/gui/painting/qpainter/CMakeLists.txt index 6b46db4385..bfb992c7b5 100644 --- a/tests/auto/gui/painting/qpainter/CMakeLists.txt +++ b/tests/auto/gui/painting/qpainter/CMakeLists.txt @@ -23,7 +23,7 @@ file(GLOB_RECURSE test_data_glob list(APPEND test_data ${test_data_glob}) list(APPEND test_data "task217400.png") -qt_add_test(tst_qpainter +qt_internal_add_test(tst_qpainter SOURCES tst_qpainter.cpp PUBLIC_LIBRARIES @@ -36,7 +36,7 @@ qt_add_test(tst_qpainter ## Scopes: ##################################################################### -qt_extend_target(tst_qpainter CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qpainter CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets Qt::WidgetsPrivate @@ -229,7 +229,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "task217400.png" ) - qt_add_resource(tst_qpainter "testdata" + qt_internal_add_resource(tst_qpainter "testdata" PREFIX "/" FILES diff --git a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt index edc1ab14bf..47450c9146 100644 --- a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt +++ b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpainterpath Test: ##################################################################### -qt_add_test(tst_qpainterpath +qt_internal_add_test(tst_qpainterpath SOURCES tst_qpainterpath.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt index 1344682991..f4c301c42e 100644 --- a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt +++ b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpainterpathstroker Test: ##################################################################### -qt_add_test(tst_qpainterpathstroker +qt_internal_add_test(tst_qpainterpathstroker SOURCES tst_qpainterpathstroker.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qpathclipper/CMakeLists.txt b/tests/auto/gui/painting/qpathclipper/CMakeLists.txt index 0cfaee06ec..191b1b8a93 100644 --- a/tests/auto/gui/painting/qpathclipper/CMakeLists.txt +++ b/tests/auto/gui/painting/qpathclipper/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qpathclipper Test: ##################################################################### -qt_add_test(tst_qpathclipper +qt_internal_add_test(tst_qpathclipper SOURCES paths.cpp paths.h tst_qpathclipper.cpp @@ -25,7 +25,7 @@ qt_add_test(tst_qpathclipper ## Scopes: ##################################################################### -qt_extend_target(tst_qpathclipper CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY +qt_internal_extend_target(tst_qpathclipper CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY PUBLIC_LIBRARIES m ) diff --git a/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt b/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt index 1f2cf3db27..c6eb5b1034 100644 --- a/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt +++ b/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpdfwriter Test: ##################################################################### -qt_add_test(tst_qpdfwriter +qt_internal_add_test(tst_qpdfwriter SOURCES tst_qpdfwriter.cpp DEFINES diff --git a/tests/auto/gui/painting/qpen/CMakeLists.txt b/tests/auto/gui/painting/qpen/CMakeLists.txt index 076d15b1d1..321c40fa8f 100644 --- a/tests/auto/gui/painting/qpen/CMakeLists.txt +++ b/tests/auto/gui/painting/qpen/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpen Test: ##################################################################### -qt_add_test(tst_qpen +qt_internal_add_test(tst_qpen SOURCES tst_qpen.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qpolygon/CMakeLists.txt b/tests/auto/gui/painting/qpolygon/CMakeLists.txt index 83477e0689..a61529d397 100644 --- a/tests/auto/gui/painting/qpolygon/CMakeLists.txt +++ b/tests/auto/gui/painting/qpolygon/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpolygon Test: ##################################################################### -qt_add_test(tst_qpolygon +qt_internal_add_test(tst_qpolygon SOURCES tst_qpolygon.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qpolygon ## Scopes: ##################################################################### -qt_extend_target(tst_qpolygon CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY +qt_internal_extend_target(tst_qpolygon CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY PUBLIC_LIBRARIES m ) diff --git a/tests/auto/gui/painting/qrangecollection/CMakeLists.txt b/tests/auto/gui/painting/qrangecollection/CMakeLists.txt index ce25304c4a..d4aa7986a7 100644 --- a/tests/auto/gui/painting/qrangecollection/CMakeLists.txt +++ b/tests/auto/gui/painting/qrangecollection/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrangecollection Test: ##################################################################### -qt_add_test(tst_qrangecollection +qt_internal_add_test(tst_qrangecollection SOURCES tst_qrangecollection.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qregion/CMakeLists.txt b/tests/auto/gui/painting/qregion/CMakeLists.txt index 8779fecd5e..9564e0719e 100644 --- a/tests/auto/gui/painting/qregion/CMakeLists.txt +++ b/tests/auto/gui/painting/qregion/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qregion Test: ##################################################################### -qt_add_test(tst_qregion +qt_internal_add_test(tst_qregion SOURCES tst_qregion.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/painting/qtransform/CMakeLists.txt b/tests/auto/gui/painting/qtransform/CMakeLists.txt index 07056be3ee..4d50e2cf33 100644 --- a/tests/auto/gui/painting/qtransform/CMakeLists.txt +++ b/tests/auto/gui/painting/qtransform/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtransform Test: ##################################################################### -qt_add_test(tst_qtransform +qt_internal_add_test(tst_qtransform SOURCES tst_qtransform.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qtransform ## Scopes: ##################################################################### -qt_extend_target(tst_qtransform CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY +qt_internal_extend_target(tst_qtransform CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY PUBLIC_LIBRARIES m ) |