diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-07 18:01:06 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 09:38:35 +0200 |
| commit | e9a328bc0e56b429a370b13c8e0b4790916cebde (patch) | |
| tree | 059f3b089a8557cb4c45e3dc059b58e020e34dcb /tests/auto/widgets | |
| parent | 5417f1e40cb647c05bffad21493feacac45f193e (diff) | |
CMake: Regenerate tests with new qt_ prefixed APIs
Use pro2cmake with '--api-version 2' to force regenerate
projects to use the new prefixed qt_foo APIs.
Change-Id: I055c4837860319e93aaa6b09d646dda4fc2a4069
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/widgets')
125 files changed, 152 insertions, 152 deletions
diff --git a/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt index 81ffdeff90..e0c25e381b 100644 --- a/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcolordialog Test: ##################################################################### -add_qt_test(tst_qcolordialog +qt_add_test(tst_qcolordialog SOURCES tst_qcolordialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt index 2c003f6fb6..54bfb2aedb 100644 --- a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdialog Test: ##################################################################### -add_qt_test(tst_qdialog +qt_add_test(tst_qdialog SOURCES tst_qdialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt index 9463020c66..1120c2b53b 100644 --- a/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qerrormessage Test: ##################################################################### -add_qt_test(tst_qerrormessage +qt_add_test(tst_qerrormessage SOURCES tst_qerrormessage.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt index 7b6d004776..a1f37df137 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfiledialog Test: ##################################################################### -add_qt_test(tst_qfiledialog +qt_add_test(tst_qfiledialog SOURCES tst_qfiledialog.cpp DEFINES diff --git a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt index 2fb610a784..6fae963999 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfiledialog2 Test: ##################################################################### -add_qt_test(tst_qfiledialog2 +qt_add_test(tst_qfiledialog2 SOURCES tst_qfiledialog2.cpp DEFINES diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt index 346e2a7d5a..595b30bd56 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfilesystemmodel Test: ##################################################################### -add_qt_test(tst_qfilesystemmodel +qt_add_test(tst_qfilesystemmodel SOURCES ../../../../shared/emulationdetector.h tst_qfilesystemmodel.cpp diff --git a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt index af858c8946..e8a6d368b8 100644 --- a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfontdialog Test: ##################################################################### -add_qt_test(tst_qfontdialog +qt_add_test(tst_qfontdialog SOURCES tst_qfontdialog.cpp PUBLIC_LIBRARIES @@ -27,7 +27,7 @@ set(testfonts_resource_files "../../../shared/resources/testfont.ttf" ) -add_qt_resource(tst_qfontdialog "testfonts" +qt_add_resource(tst_qfontdialog "testfonts" PREFIX "/" FILES diff --git a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt index 7cd02a04c0..9cd73ef4f1 100644 --- a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qinputdialog Test: ##################################################################### -add_qt_test(tst_qinputdialog +qt_add_test(tst_qinputdialog SOURCES tst_qinputdialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt index ae12c58ca2..f26171f08a 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmessagebox Test: ##################################################################### -add_qt_test(tst_qmessagebox +qt_add_test(tst_qmessagebox SOURCES tst_qmessagebox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt index 2f20ff0d81..f3d7fc365b 100644 --- a/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprogressdialog Test: ##################################################################### -add_qt_test(tst_qprogressdialog +qt_add_test(tst_qprogressdialog SOURCES tst_qprogressdialog.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt index d1e2a6686c..d92fac5253 100644 --- a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsidebar Test: ##################################################################### -add_qt_test(tst_qsidebar +qt_add_test(tst_qsidebar SOURCES tst_qsidebar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt index bbe7bddd9d..f385812b40 100644 --- a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwizard Test: ##################################################################### -add_qt_test(tst_qwizard +qt_add_test(tst_qwizard SOURCES tst_qwizard.cpp tst_qwizard_2.cpp @@ -21,7 +21,7 @@ set(qwizard_resource_files "images/watermark.png" ) -add_qt_resource(tst_qwizard "qwizard" +qt_add_resource(tst_qwizard "qwizard" PREFIX "/" FILES diff --git a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt index 4cdeb6b4e5..b8665dc2d2 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt +++ b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicseffect Test: ##################################################################### -add_qt_test(tst_qgraphicseffect +qt_add_test(tst_qgraphicseffect SOURCES tst_qgraphicseffect.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt index 6ffd2c4029..56feb2c09e 100644 --- a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt +++ b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpixmapfilter Test: ##################################################################### -add_qt_test(tst_qpixmapfilter +qt_add_test(tst_qpixmapfilter SOURCES tst_qpixmapfilter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt index db323fcb15..8bf6a5b5ad 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsanchorlayout Test: ##################################################################### -add_qt_test(tst_qgraphicsanchorlayout +qt_add_test(tst_qgraphicsanchorlayout SOURCES tst_qgraphicsanchorlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt index 9d9fc68832..a945cbf86f 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsanchorlayout1 Test: ##################################################################### -add_qt_test(tst_qgraphicsanchorlayout1 +qt_add_test(tst_qgraphicsanchorlayout1 SOURCES tst_qgraphicsanchorlayout1.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt index ac1ac91f8b..a508934554 100644 --- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicseffectsource Test: ##################################################################### -add_qt_test(tst_qgraphicseffectsource +qt_add_test(tst_qgraphicseffectsource SOURCES tst_qgraphicseffectsource.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt index c02f142182..778f30d7bf 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsgridlayout Test: ##################################################################### -add_qt_test(tst_qgraphicsgridlayout +qt_add_test(tst_qgraphicsgridlayout SOURCES tst_qgraphicsgridlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt index 81cdeeb84a..013315c9b2 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsitem Test: ##################################################################### -add_qt_test(tst_qgraphicsitem +qt_add_test(tst_qgraphicsitem SOURCES tst_qgraphicsitem.cpp DEFINES @@ -21,7 +21,7 @@ add_qt_test(tst_qgraphicsitem ## Scopes: ##################################################################### -extend_target(tst_qgraphicsitem CONDITION WIN32 +qt_extend_target(tst_qgraphicsitem CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt index 179b6c8497..63adc2ea78 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsitemanimation Test: ##################################################################### -add_qt_test(tst_qgraphicsitemanimation +qt_add_test(tst_qgraphicsitemanimation SOURCES tst_qgraphicsitemanimation.cpp DEFINES diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt index 9a149f9df1..f11bcfe0a1 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicslayout Test: ##################################################################### -add_qt_test(tst_qgraphicslayout +qt_add_test(tst_qgraphicslayout SOURCES tst_qgraphicslayout.cpp DEFINES diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt index 56b9f73127..36d7177f22 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicslayoutitem Test: ##################################################################### -add_qt_test(tst_qgraphicslayoutitem +qt_add_test(tst_qgraphicslayoutitem SOURCES tst_qgraphicslayoutitem.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt index 1a44be75a1..96dbadc4b9 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicslinearlayout Test: ##################################################################### -add_qt_test(tst_qgraphicslinearlayout +qt_add_test(tst_qgraphicslinearlayout SOURCES tst_qgraphicslinearlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt index 0e29191792..f999e13162 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsobject Test: ##################################################################### -add_qt_test(tst_qgraphicsobject +qt_add_test(tst_qgraphicsobject SOURCES tst_qgraphicsobject.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt index cca35623e8..8cb278720b 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicspixmapitem Test: ##################################################################### -add_qt_test(tst_qgraphicspixmapitem +qt_add_test(tst_qgraphicspixmapitem SOURCES tst_qgraphicspixmapitem.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt index 86c6965756..5742353892 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicspolygonitem Test: ##################################################################### -add_qt_test(tst_qgraphicspolygonitem +qt_add_test(tst_qgraphicspolygonitem SOURCES tst_qgraphicspolygonitem.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt index accec5ff40..67509dae98 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsproxywidget Test: ##################################################################### -add_qt_test(tst_qgraphicsproxywidget +qt_add_test(tst_qgraphicsproxywidget SOURCES tst_qgraphicsproxywidget.cpp DEFINES diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt index efcb4598e5..3208cf2b36 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsscene Test: ##################################################################### -add_qt_test(tst_qgraphicsscene +qt_add_test(tst_qgraphicsscene SOURCES tst_qgraphicsscene.cpp DEFINES @@ -23,7 +23,7 @@ set(images_resource_files "Ash_European.jpg" ) -add_qt_resource(tst_qgraphicsscene "images" +qt_add_resource(tst_qgraphicsscene "images" PREFIX "/" FILES @@ -60,7 +60,7 @@ set(testdata_resource_files "testData/render/topright-topleft-untransformed.png" ) -add_qt_resource(tst_qgraphicsscene "testdata" +qt_add_resource(tst_qgraphicsscene "testdata" PREFIX "/" FILES @@ -71,7 +71,7 @@ add_qt_resource(tst_qgraphicsscene "testdata" ## Scopes: ##################################################################### -extend_target(tst_qgraphicsscene CONDITION WIN32 +qt_extend_target(tst_qgraphicsscene CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt index 5fa72f7b46..607bcd0ea4 100644 --- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qgraphicssceneindex Test: ##################################################################### -add_qt_test(tst_qgraphicssceneindex +qt_add_test(tst_qgraphicssceneindex SOURCES tst_qgraphicssceneindex.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt index 450c0269f3..a3a19931e6 100644 --- a/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicstransform Test: ##################################################################### -add_qt_test(tst_qgraphicstransform +qt_add_test(tst_qgraphicstransform SOURCES tst_qgraphicstransform.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt index 48064c2bf4..c8ead072a2 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicsview Test: ##################################################################### -add_qt_test(tst_qgraphicsview +qt_add_test(tst_qgraphicsview SOURCES tst_qgraphicsview.cpp tst_qgraphicsview.h tst_qgraphicsview_2.cpp @@ -25,7 +25,7 @@ add_qt_test(tst_qgraphicsview ## Scopes: ##################################################################### -extend_target(tst_qgraphicsview CONDITION QT_FEATURE_opengl +qt_extend_target(tst_qgraphicsview CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGL Qt::OpenGLWidgets diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt index 7325f7eb21..d519985662 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgraphicswidget Test: ##################################################################### -add_qt_test(tst_qgraphicswidget +qt_add_test(tst_qgraphicswidget SOURCES tst_qgraphicswidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt index 2fc8c14eb6..0b292e06f8 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractitemview Test: ##################################################################### -add_qt_test(tst_qabstractitemview +qt_add_test(tst_qabstractitemview SOURCES tst_qabstractitemview.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt index d33e3b9c2e..002912d5cf 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcolumnview Test: ##################################################################### -add_qt_test(tst_qcolumnview +qt_add_test(tst_qcolumnview SOURCES ../../../../shared/fakedirmodel.h tst_qcolumnview.cpp diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt b/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt index f3e4af0c23..6cf9cbca43 100644 --- a/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdatawidgetmapper Test: ##################################################################### -add_qt_test(tst_qdatawidgetmapper +qt_add_test(tst_qdatawidgetmapper SOURCES tst_qdatawidgetmapper.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt b/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt index 024519ad9c..4107c3584e 100644 --- a/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfileiconprovider Test: ##################################################################### -add_qt_test(tst_qfileiconprovider +qt_add_test(tst_qfileiconprovider SOURCES tst_qfileiconprovider.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt index 8949ac4957..d90c12869f 100644 --- a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qheaderview Test: ##################################################################### -add_qt_test(tst_qheaderview +qt_add_test(tst_qheaderview SOURCES tst_qheaderview.cpp DEFINES diff --git a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt index dfdf263431..3ea37aa737 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qitemdelegate Test: ##################################################################### -add_qt_test(tst_qitemdelegate +qt_add_test(tst_qitemdelegate SOURCES tst_qitemdelegate.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ add_qt_test(tst_qitemdelegate ## Scopes: ##################################################################### -extend_target(tst_qitemdelegate CONDITION WIN32 +qt_extend_target(tst_qitemdelegate CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt index 4dfb46ff4d..e56ec2e865 100644 --- a/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qitemeditorfactory Test: ##################################################################### -add_qt_test(tst_qitemeditorfactory +qt_add_test(tst_qitemeditorfactory SOURCES tst_qitemeditorfactory.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt index b27f456246..b4331b87ca 100644 --- a/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qitemview Test: ##################################################################### -add_qt_test(tst_qitemview +qt_add_test(tst_qitemview SOURCES tst_qitemview.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt index 6e14ba5c99..4a098c88f2 100644 --- a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlistview Test: ##################################################################### -add_qt_test(tst_qlistview +qt_add_test(tst_qlistview SOURCES tst_qlistview.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ add_qt_test(tst_qlistview ## Scopes: ##################################################################### -extend_target(tst_qlistview CONDITION WIN32 +qt_extend_target(tst_qlistview CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt index aebcb4c49e..426b9088bc 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlistwidget Test: ##################################################################### -add_qt_test(tst_qlistwidget +qt_add_test(tst_qlistwidget SOURCES tst_qlistwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt index 20e50d2de3..d1291e709d 100644 --- a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtableview Test: ##################################################################### -add_qt_test(tst_qtableview +qt_add_test(tst_qtableview SOURCES tst_qtableview.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt index 66344e9d32..cdb393484a 100644 --- a/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtablewidget Test: ##################################################################### -add_qt_test(tst_qtablewidget +qt_add_test(tst_qtablewidget SOURCES tst_qtablewidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt index 40a6a1a6d6..a6c5adb967 100644 --- a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtreeview Test: ##################################################################### -add_qt_test(tst_qtreeview +qt_add_test(tst_qtreeview SOURCES ../../../../shared/fakedirmodel.h tst_qtreeview.cpp diff --git a/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt index dde2e9d4ab..d58f004561 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtreewidget Test: ##################################################################### -add_qt_test(tst_qtreewidget +qt_add_test(tst_qtreewidget SOURCES tst_qtreewidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt index 65ac8cda8b..ac3a0645e4 100644 --- a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtreewidgetitemiterator Test: ##################################################################### -add_qt_test(tst_qtreewidgetitemiterator +qt_add_test(tst_qtreewidgetitemiterator SOURCES tst_qtreewidgetitemiterator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qaction/CMakeLists.txt b/tests/auto/widgets/kernel/qaction/CMakeLists.txt index 469cc4d597..5779f881df 100644 --- a/tests/auto/widgets/kernel/qaction/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qaction/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaction Test: ##################################################################### -add_qt_test(tst_qaction +qt_add_test(tst_qaction SOURCES tst_qaction.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt b/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt index a55acf2efb..1f9c93b1d0 100644 --- a/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qactiongroup Test: ##################################################################### -add_qt_test(tst_qactiongroup +qt_add_test(tst_qactiongroup SOURCES tst_qactiongroup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt index df5f5f4e6c..9692925831 100644 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## desktopsettingsaware Binary: ##################################################################### -add_qt_executable(desktopsettingsaware +qt_add_executable(desktopsettingsaware SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt index 98a38da7c0..110c53d32f 100644 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt @@ -4,7 +4,7 @@ ## desktopsettingsaware Binary: ##################################################################### -add_qt_executable(desktopsettingsaware_helper # special case +qt_add_executable(desktopsettingsaware_helper # special case SOURCES main.cpp OUTPUT_DIRECTORY # special case diff --git a/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt index fc990e790e..fdd6547b41 100644 --- a/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## modal Binary: ##################################################################### -add_qt_executable(modal +qt_add_executable(modal SOURCES base.cpp base.h main.cpp diff --git a/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt index c598ca600a..da00368540 100644 --- a/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt @@ -4,7 +4,7 @@ ## modal Binary: ##################################################################### -add_qt_executable(modal_helper # special case +qt_add_executable(modal_helper # special case SOURCES base.cpp base.h main.cpp diff --git a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt index 7f92e1cee8..114b8a286b 100644 --- a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND test_data "../test/test.pro") list(APPEND test_data "../tmp/README") list(APPEND test_data "../modal") -add_qt_test(test +qt_add_test(test SOURCES ../tst_qapplication.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ add_qt_test(test ## Scopes: ##################################################################### -extend_target(test CONDITION builtin_testdata +qt_extend_target(test CONDITION builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt index 304480f509..f30b05d2d3 100644 --- a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND test_data "../test/test.pro") list(APPEND test_data "../tmp/README") list(APPEND test_data "../modal") -add_qt_test(tst_qapplication # special case +qt_add_test(tst_qapplication # special case SOURCES ../tst_qapplication.cpp PUBLIC_LIBRARIES @@ -25,7 +25,7 @@ add_qt_test(tst_qapplication # special case ## Scopes: ##################################################################### -extend_target(tst_qapplication CONDITION builtin_testdata # special case +qt_extend_target(tst_qapplication CONDITION builtin_testdata # special case DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt index 901d20f1e3..a1986aa1a8 100644 --- a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qboxlayout Test: ##################################################################### -add_qt_test(tst_qboxlayout +qt_add_test(tst_qboxlayout SOURCES tst_qboxlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt index f786f3331c..04124322e0 100644 --- a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qformlayout Test: ##################################################################### -add_qt_test(tst_qformlayout +qt_add_test(tst_qformlayout SOURCES tst_qformlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt index 61bf8d303a..416a02ff19 100644 --- a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgesturerecognizer Test: ##################################################################### -add_qt_test(tst_qgesturerecognizer +qt_add_test(tst_qgesturerecognizer SOURCES tst_qgesturerecognizer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt index 79995454f7..c70edfc4ac 100644 --- a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgridlayout Test: ##################################################################### -add_qt_test(tst_qgridlayout +qt_add_test(tst_qgridlayout SOURCES sortdialog.ui tst_qgridlayout.cpp diff --git a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt index e63a80117f..2acf0f1eb6 100644 --- a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob baseline/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qlayout +qt_add_test(tst_qlayout SOURCES tst_qlayout.cpp PUBLIC_LIBRARIES @@ -30,7 +30,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "baseline/smartmaxsize" ) - add_qt_resource(tst_qlayout "testdata" + qt_add_resource(tst_qlayout "testdata" PREFIX "/" FILES diff --git a/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt b/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt index 5d077c87ec..f2b3272588 100644 --- a/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshortcut Test: ##################################################################### -add_qt_test(tst_qshortcut +qt_add_test(tst_qshortcut SOURCES tst_qshortcut.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt index 582f0d582d..35ff76ab2c 100644 --- a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsizepolicy Test: ##################################################################### -add_qt_test(tst_qsizepolicy +qt_add_test(tst_qsizepolicy SOURCES tst_qsizepolicy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt index a41957c9a6..470ad28bd1 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstackedlayout Test: ##################################################################### -add_qt_test(tst_qstackedlayout +qt_add_test(tst_qstackedlayout SOURCES tst_qstackedlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt b/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt index f63b6e63cd..3a62e77490 100644 --- a/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtooltip Test: ##################################################################### -add_qt_test(tst_qtooltip +qt_add_test(tst_qtooltip SOURCES tst_qtooltip.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt index bf7544c393..d9ac38be84 100644 --- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidget Test: ##################################################################### -add_qt_test(tst_qwidget +qt_add_test(tst_qwidget SOURCES tst_qwidget.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ set(qwidget_resource_files "hellotr_la.qm" ) -add_qt_resource(tst_qwidget "qwidget" +qt_add_resource(tst_qwidget "qwidget" PREFIX "/" FILES @@ -38,12 +38,12 @@ add_qt_resource(tst_qwidget "qwidget" ## Scopes: ##################################################################### -extend_target(tst_qwidget CONDITION AIX +qt_extend_target(tst_qwidget CONDITION AIX COMPILE_OPTIONS -fpermissive ) -extend_target(tst_qwidget CONDITION APPLE +qt_extend_target(tst_qwidget CONDITION APPLE SOURCES tst_qwidget_mac_helpers.mm PUBLIC_LIBRARIES @@ -51,7 +51,7 @@ extend_target(tst_qwidget CONDITION APPLE ${FWSecurity} ) -extend_target(tst_qwidget CONDITION WIN32 +qt_extend_target(tst_qwidget CONDITION WIN32 PUBLIC_LIBRARIES gdi32 user32 diff --git a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt index 201c271103..d0349c7dcc 100644 --- a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidget_window Test: ##################################################################### -add_qt_test(tst_qwidget_window +qt_add_test(tst_qwidget_window SOURCES tst_qwidget_window.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt index 06a4156b57..0a559dcac6 100644 --- a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidgetaction Test: ##################################################################### -add_qt_test(tst_qwidgetaction +qt_add_test(tst_qwidgetaction SOURCES tst_qwidgetaction.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt index dd935fdbd7..a4b8867389 100644 --- a/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidgetmetatype Test: ##################################################################### -add_qt_test(tst_qwidgetmetatype +qt_add_test(tst_qwidgetmetatype SOURCES tst_qwidgetmetatype.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt index 076f66cd78..f4244f1a30 100644 --- a/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidgetsvariant Test: ##################################################################### -add_qt_test(tst_qwidgetsvariant +qt_add_test(tst_qwidgetsvariant SOURCES tst_qwidgetsvariant.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt b/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt index 63b8b44e6f..b173fae54f 100644 --- a/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwindowcontainer Test: ##################################################################### -add_qt_test(tst_qwindowcontainer +qt_add_test(tst_qwindowcontainer SOURCES tst_qwindowcontainer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt b/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt index 44053dbe3d..d4deeaf235 100644 --- a/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt +++ b/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmacstyle Test: ##################################################################### -add_qt_test(tst_qmacstyle +qt_add_test(tst_qmacstyle SOURCES tst_qmacstyle.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/styles/qstyle/CMakeLists.txt b/tests/auto/widgets/styles/qstyle/CMakeLists.txt index 21d81113f4..8f4a1a4159 100644 --- a/tests/auto/widgets/styles/qstyle/CMakeLists.txt +++ b/tests/auto/widgets/styles/qstyle/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstyle Test: ##################################################################### -add_qt_test(tst_qstyle +qt_add_test(tst_qstyle SOURCES tst_qstyle.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt b/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt index e174057cbb..d023a2f36f 100644 --- a/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt +++ b/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstyleoption Test: ##################################################################### -add_qt_test(tst_qstyleoption +qt_add_test(tst_qstyleoption SOURCES tst_qstyleoption.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt b/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt index 01c4df38fe..06c7a36edc 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt +++ b/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qstylesheetstyle Test: ##################################################################### -add_qt_test(tst_qstylesheetstyle +qt_add_test(tst_qstylesheetstyle SOURCES tst_qstylesheetstyle.cpp PUBLIC_LIBRARIES @@ -25,7 +25,7 @@ set(resources_resource_files "images/testimage@2x.png" ) -add_qt_resource(tst_qstylesheetstyle "resources" +qt_add_resource(tst_qstylesheetstyle "resources" PREFIX "/" FILES diff --git a/tests/auto/widgets/util/qcompleter/CMakeLists.txt b/tests/auto/widgets/util/qcompleter/CMakeLists.txt index fb87c3beec..aba10e1600 100644 --- a/tests/auto/widgets/util/qcompleter/CMakeLists.txt +++ b/tests/auto/widgets/util/qcompleter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcompleter Test: ##################################################################### -add_qt_test(tst_qcompleter +qt_add_test(tst_qcompleter SOURCES tst_qcompleter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/util/qscroller/CMakeLists.txt b/tests/auto/widgets/util/qscroller/CMakeLists.txt index b6c6efcc2f..f85caf33a2 100644 --- a/tests/auto/widgets/util/qscroller/CMakeLists.txt +++ b/tests/auto/widgets/util/qscroller/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscroller Test: ##################################################################### -add_qt_test(tst_qscroller +qt_add_test(tst_qscroller SOURCES tst_qscroller.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt b/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt index df6efa7281..6677a80a3c 100644 --- a/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt +++ b/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsystemtrayicon Test: ##################################################################### -add_qt_test(tst_qsystemtrayicon +qt_add_test(tst_qsystemtrayicon SOURCES tst_qsystemtrayicon.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt index 48a174b6e1..a308721727 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractbutton Test: ##################################################################### -add_qt_test(tst_qabstractbutton +qt_add_test(tst_qabstractbutton SOURCES tst_qabstractbutton.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt index cb1b2aa936..4a72b409e3 100644 --- a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractscrollarea Test: ##################################################################### -add_qt_test(tst_qabstractscrollarea +qt_add_test(tst_qabstractscrollarea SOURCES tst_qabstractscrollarea.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt index 0dbbf63239..d2dbcb3585 100644 --- a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractslider Test: ##################################################################### -add_qt_test(tst_qabstractslider +qt_add_test(tst_qabstractslider SOURCES tst_qabstractslider.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt index 32c814c535..3ca8eb63d0 100644 --- a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractspinbox Test: ##################################################################### -add_qt_test(tst_qabstractspinbox +qt_add_test(tst_qabstractspinbox SOURCES tst_qabstractspinbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt index 92d04e0c26..822fdf223c 100644 --- a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbuttongroup Test: ##################################################################### -add_qt_test(tst_qbuttongroup +qt_add_test(tst_qbuttongroup SOURCES tst_qbuttongroup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt index 10e24a1016..051b00d0bb 100644 --- a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcalendarwidget Test: ##################################################################### -add_qt_test(tst_qcalendarwidget +qt_add_test(tst_qcalendarwidget SOURCES tst_qcalendarwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt index 2418791e5d..1c44111753 100644 --- a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcheckbox Test: ##################################################################### -add_qt_test(tst_qcheckbox +qt_add_test(tst_qcheckbox SOURCES tst_qcheckbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt index 95fbe14eec..a0aabd6773 100644 --- a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "qtlogo.png") list(APPEND test_data "qtlogoinverted.png") -add_qt_test(tst_qcombobox +qt_add_test(tst_qcombobox SOURCES tst_qcombobox.cpp DEFINES diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt index 59ba375358..5beababe97 100644 --- a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcommandlinkbutton Test: ##################################################################### -add_qt_test(tst_qcommandlinkbutton +qt_add_test(tst_qcommandlinkbutton SOURCES tst_qcommandlinkbutton.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt index 8eb294d361..8db1423992 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdatetimeedit Test: ##################################################################### -add_qt_test(tst_qdatetimeedit +qt_add_test(tst_qdatetimeedit SOURCES tst_qdatetimeedit.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qdial/CMakeLists.txt b/tests/auto/widgets/widgets/qdial/CMakeLists.txt index e725edacb6..162eda24eb 100644 --- a/tests/auto/widgets/widgets/qdial/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdial/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdial Test: ##################################################################### -add_qt_test(tst_qdial +qt_add_test(tst_qdial SOURCES tst_qdial.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt index c4961f13a1..16ad2286fb 100644 --- a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdialogbuttonbox Test: ##################################################################### -add_qt_test(tst_qdialogbuttonbox +qt_add_test(tst_qdialogbuttonbox SOURCES tst_qdialogbuttonbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt index e2b6cc5942..0f3e83cead 100644 --- a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdockwidget Test: ##################################################################### -add_qt_test(tst_qdockwidget +qt_add_test(tst_qdockwidget SOURCES tst_qdockwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt index b639289db8..bef0745d01 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdoublespinbox Test: ##################################################################### -add_qt_test(tst_qdoublespinbox +qt_add_test(tst_qdoublespinbox SOURCES tst_qdoublespinbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt index 85160faed7..6456e5b7c5 100644 --- a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfocusframe Test: ##################################################################### -add_qt_test(tst_qfocusframe +qt_add_test(tst_qfocusframe SOURCES tst_qfocusframe.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt index 777abc48c5..1500be0023 100644 --- a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfontcombobox Test: ##################################################################### -add_qt_test(tst_qfontcombobox +qt_add_test(tst_qfontcombobox SOURCES tst_qfontcombobox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt index ae23555fa5..89f91d1967 100644 --- a/tests/auto/widgets/widgets/qframe/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob images/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qframe +qt_add_test(tst_qframe SOURCES tst_qframe.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt index 09d4623cd9..d71fcd18d8 100644 --- a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgroupbox Test: ##################################################################### -add_qt_test(tst_qgroupbox +qt_add_test(tst_qgroupbox SOURCES tst_qgroupbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt index c57f8b5c0a..e373c14ea4 100644 --- a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qkeysequenceedit Test: ##################################################################### -add_qt_test(tst_qkeysequenceedit +qt_add_test(tst_qkeysequenceedit SOURCES tst_qkeysequenceedit.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt index a4fe508a02..6f8ac33b83 100644 --- a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob *.png) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qlabel +qt_add_test(tst_qlabel SOURCES tst_qlabel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt index fbd9ff5913..739b9bb55f 100644 --- a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlcdnumber Test: ##################################################################### -add_qt_test(tst_qlcdnumber +qt_add_test(tst_qlcdnumber SOURCES tst_qlcdnumber.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt index 615a5a98cb..cdb026c220 100644 --- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlineedit Test: ##################################################################### -add_qt_test(tst_qlineedit +qt_add_test(tst_qlineedit SOURCES tst_qlineedit.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ add_qt_test(tst_qlineedit ## Scopes: ##################################################################### -extend_target(tst_qlineedit CONDITION MACOS +qt_extend_target(tst_qlineedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt index 55bcf941d0..93d0e212c6 100644 --- a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmainwindow Test: ##################################################################### -add_qt_test(tst_qmainwindow +qt_add_test(tst_qmainwindow SOURCES tst_qmainwindow.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt index 961bd09492..aa694bd9b7 100644 --- a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmdiarea Test: ##################################################################### -add_qt_test(tst_qmdiarea +qt_add_test(tst_qmdiarea SOURCES tst_qmdiarea.cpp DEFINES @@ -21,12 +21,12 @@ add_qt_test(tst_qmdiarea ## Scopes: ##################################################################### -extend_target(tst_qmdiarea CONDITION TARGET Qt::OpenGL +qt_extend_target(tst_qmdiarea CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL ) -extend_target(tst_qmdiarea CONDITION APPLE +qt_extend_target(tst_qmdiarea CONDITION APPLE PUBLIC_LIBRARIES ${FWSecurity} ) diff --git a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt index 791d411970..47c8078777 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmdisubwindow Test: ##################################################################### -add_qt_test(tst_qmdisubwindow +qt_add_test(tst_qmdisubwindow SOURCES tst_qmdisubwindow.cpp DEFINES diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt index 63037b7eaa..493e8af6b1 100644 --- a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmenu Test: ##################################################################### -add_qt_test(tst_qmenu +qt_add_test(tst_qmenu SOURCES tst_qmenu.cpp PUBLIC_LIBRARIES @@ -17,14 +17,14 @@ add_qt_test(tst_qmenu ## Scopes: ##################################################################### -extend_target(tst_qmenu CONDITION MACOS +qt_extend_target(tst_qmenu CONDITION MACOS SOURCES tst_qmenu_mac.mm PUBLIC_LIBRARIES objc ) -extend_target(tst_qmenu CONDITION NOT MACOS +qt_extend_target(tst_qmenu CONDITION NOT MACOS DEFINES QTEST_QPA_MOUSE_HANDLING ) diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt index 415f2aa79f..1b412981d8 100644 --- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmenubar Test: ##################################################################### -add_qt_test(tst_qmenubar +qt_add_test(tst_qmenubar SOURCES tst_qmenubar.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ add_qt_test(tst_qmenubar ## Scopes: ##################################################################### -extend_target(tst_qmenubar CONDITION MACOS +qt_extend_target(tst_qmenubar CONDITION MACOS SOURCES tst_qmenubar_mac.mm PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index c3fdf39fe1..d1af2e811c 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qopenglwidget Test: ##################################################################### -add_qt_test(tst_qopenglwidget +qt_add_test(tst_qopenglwidget SOURCES tst_qopenglwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt index cb00d5dd93..994f2b97ab 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qplaintextedit Test: ##################################################################### -add_qt_test(tst_qplaintextedit +qt_add_test(tst_qplaintextedit SOURCES tst_qplaintextedit.cpp INCLUDE_DIRECTORIES @@ -19,7 +19,7 @@ add_qt_test(tst_qplaintextedit ## Scopes: ##################################################################### -extend_target(tst_qplaintextedit CONDITION MACOS +qt_extend_target(tst_qplaintextedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt index f8b3ac38d9..34131ba34e 100644 --- a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprogressbar Test: ##################################################################### -add_qt_test(tst_qprogressbar +qt_add_test(tst_qprogressbar SOURCES tst_qprogressbar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt index 8d1300de79..186bce967f 100644 --- a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpushbutton Test: ##################################################################### -add_qt_test(tst_qpushbutton +qt_add_test(tst_qpushbutton SOURCES tst_qpushbutton.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt index 10db8a2db8..194f6689fe 100644 --- a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qradiobutton Test: ##################################################################### -add_qt_test(tst_qradiobutton +qt_add_test(tst_qradiobutton SOURCES tst_qradiobutton.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt index cdfb32e0a2..0de4565b5d 100644 --- a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscrollarea Test: ##################################################################### -add_qt_test(tst_qscrollarea +qt_add_test(tst_qscrollarea SOURCES tst_qscrollarea.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt index 83d091755f..8b9a3d85ce 100644 --- a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscrollbar Test: ##################################################################### -add_qt_test(tst_qscrollbar +qt_add_test(tst_qscrollbar SOURCES tst_qscrollbar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt index d3b28797f2..084b6b1404 100644 --- a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsizegrip Test: ##################################################################### -add_qt_test(tst_qsizegrip +qt_add_test(tst_qsizegrip SOURCES tst_qsizegrip.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/widgets/widgets/qslider/CMakeLists.txt b/tests/auto/widgets/widgets/qslider/CMakeLists.txt index 583f12a1fb..a34bfc1ef2 100644 --- a/tests/auto/widgets/widgets/qslider/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qslider/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qslider Test: ##################################################################### -add_qt_test(tst_qslider +qt_add_test(tst_qslider SOURCES tst_qslider.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt index 826de28cb4..9b1dbaa337 100644 --- a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qspinbox Test: ##################################################################### -add_qt_test(tst_qspinbox +qt_add_test(tst_qspinbox SOURCES tst_qspinbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt index babe84f43e..fba11c19d7 100644 --- a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsplashscreen Test: ##################################################################### -add_qt_test(tst_qsplashscreen +qt_add_test(tst_qsplashscreen SOURCES tst_qsplashscreen.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt index 98c165f034..d25ce98e6c 100644 --- a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "extradata.txt") list(APPEND test_data "setSizes3.dat") -add_qt_test(tst_qsplitter +qt_add_test(tst_qsplitter SOURCES tst_qsplitter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt index 37807eb73a..64a97eb7b7 100644 --- a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstackedwidget Test: ##################################################################### -add_qt_test(tst_qstackedwidget +qt_add_test(tst_qstackedwidget SOURCES tst_qstackedwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt index 56f3c960fd..e5f731d9eb 100644 --- a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstatusbar Test: ##################################################################### -add_qt_test(tst_qstatusbar +qt_add_test(tst_qstatusbar SOURCES tst_qstatusbar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt index d23d23d88f..4df38be259 100644 --- a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtabbar Test: ##################################################################### -add_qt_test(tst_qtabbar +qt_add_test(tst_qtabbar SOURCES tst_qtabbar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt index 130cf2422a..f433986a8b 100644 --- a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtabwidget Test: ##################################################################### -add_qt_test(tst_qtabwidget +qt_add_test(tst_qtabwidget SOURCES tst_qtabwidget.cpp INCLUDE_DIRECTORIES @@ -18,7 +18,7 @@ add_qt_test(tst_qtabwidget ## Scopes: ##################################################################### -extend_target(tst_qtabwidget CONDITION WIN32 +qt_extend_target(tst_qtabwidget CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt index 503dc32a83..8f1ddaf3bd 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt @@ -19,7 +19,7 @@ file(GLOB_RECURSE test_data_glob subdir/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qtextbrowser +qt_add_test(tst_qtextbrowser SOURCES tst_qtextbrowser.cpp PUBLIC_LIBRARIES @@ -31,7 +31,7 @@ add_qt_test(tst_qtextbrowser ## Scopes: ##################################################################### -extend_target(tst_qtextbrowser CONDITION builtin_testdata +qt_extend_target(tst_qtextbrowser CONDITION builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt index 719acd8dbc..df973fe087 100644 --- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "fullWidthSelection") -add_qt_test(tst_qtextedit +qt_add_test(tst_qtextedit SOURCES tst_qtextedit.cpp PUBLIC_LIBRARIES @@ -22,7 +22,7 @@ add_qt_test(tst_qtextedit ## Scopes: ##################################################################### -extend_target(tst_qtextedit CONDITION MACOS +qt_extend_target(tst_qtextedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt index d3aef03fa1..afe50c1f13 100644 --- a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtoolbar Test: ##################################################################### -add_qt_test(tst_qtoolbar +qt_add_test(tst_qtoolbar SOURCES tst_qtoolbar.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt index dc3e5d016c..1692176f50 100644 --- a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtoolbox Test: ##################################################################### -add_qt_test(tst_qtoolbox +qt_add_test(tst_qtoolbox SOURCES tst_qtoolbox.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt index ae36488341..42d7cf73f1 100644 --- a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtoolbutton Test: ##################################################################### -add_qt_test(tst_qtoolbutton +qt_add_test(tst_qtoolbutton SOURCES tst_qtoolbutton.cpp PUBLIC_LIBRARIES |