From af72e13636eab0d294980f710a2320ed28b078ef Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 Nov 2019 17:51:02 +0100 Subject: Regenerate tests/auto/widgets/graphicsview Change-Id: I2e6a8f2f92e9cb8d6bb0be53068dfd43ba87db4c Reviewed-by: Simon Hausmann --- .../qgraphicsanchorlayout/CMakeLists.txt | 15 ++++- .../qgraphicsanchorlayout1/CMakeLists.txt | 15 ++++- .../qgraphicseffectsource/CMakeLists.txt | 15 ++++- .../qgraphicsgridlayout/CMakeLists.txt | 14 +++- .../graphicsview/qgraphicsitem/CMakeLists.txt | 25 ++++++-- .../qgraphicsitemanimation/CMakeLists.txt | 13 +++- .../graphicsview/qgraphicslayout/CMakeLists.txt | 13 +++- .../qgraphicslayoutitem/CMakeLists.txt | 14 +++- .../qgraphicslinearlayout/CMakeLists.txt | 14 +++- .../graphicsview/qgraphicsobject/CMakeLists.txt | 16 ++++- .../qgraphicspixmapitem/CMakeLists.txt | 14 +++- .../qgraphicspolygonitem/CMakeLists.txt | 14 +++- .../qgraphicsproxywidget/CMakeLists.txt | 13 +++- .../graphicsview/qgraphicsscene/CMakeLists.txt | 75 ++++++++++++++++++++-- .../qgraphicssceneindex/CMakeLists.txt | 22 ++++++- .../graphicsview/qgraphicstransform/CMakeLists.txt | 14 +++- .../graphicsview/qgraphicsview/CMakeLists.txt | 16 ++++- .../graphicsview/qgraphicswidget/CMakeLists.txt | 15 ++++- 18 files changed, 302 insertions(+), 35 deletions(-) (limited to 'tests/auto/widgets/graphicsview') diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt index 6e97335a9a..6c213bc209 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt @@ -1,6 +1,17 @@ -add_qt_test("tst_qgraphicsanchorlayout" SOURCES tst_qgraphicsanchorlayout.cpp +# Generated from qgraphicsanchorlayout.pro. + +##################################################################### +## tst_qgraphicsanchorlayout Test: +##################################################################### + +add_qt_test(tst_qgraphicsanchorlayout + SOURCES + tst_qgraphicsanchorlayout.cpp LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt index ef52c03bc8..a6739093b4 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt @@ -1,6 +1,17 @@ -add_qt_test("tst_qgraphicsanchorlayout1" SOURCES tst_qgraphicsanchorlayout1.cpp +# Generated from qgraphicsanchorlayout1.pro. + +##################################################################### +## tst_qgraphicsanchorlayout1 Test: +##################################################################### + +add_qt_test(tst_qgraphicsanchorlayout1 + SOURCES + tst_qgraphicsanchorlayout1.cpp LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt index 51add34605..6becd124bf 100644 --- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt @@ -1,6 +1,17 @@ -add_qt_test("tst_qgraphicseffectsource" SOURCES tst_qgraphicseffectsource.cpp +# Generated from qgraphicseffectsource.pro. + +##################################################################### +## tst_qgraphicseffectsource Test: +##################################################################### + +add_qt_test(tst_qgraphicseffectsource + SOURCES + tst_qgraphicseffectsource.cpp LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt index ecb90ea557..c02f142182 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qgraphicsgridlayout" SOURCES tst_qgraphicsgridlayout.cpp LIBRARIES Qt::Widgets) +# Generated from qgraphicsgridlayout.pro. + +##################################################################### +## tst_qgraphicsgridlayout Test: +##################################################################### + +add_qt_test(tst_qgraphicsgridlayout + SOURCES + tst_qgraphicsgridlayout.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt index e5446407ab..b500ec487a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt @@ -1,11 +1,28 @@ -add_qt_test("tst_qgraphicsitem" SOURCES tst_qgraphicsitem.cpp +# Generated from qgraphicsitem.pro. + +##################################################################### +## tst_qgraphicsitem Test: +##################################################################### + +add_qt_test(tst_qgraphicsitem + SOURCES + tst_qgraphicsitem.cpp DEFINES QT_NO_CAST_TO_ASCII LIBRARIES - Qt::WidgetsPrivate - Qt::TestPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::TestPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) -extend_target("tst_qgraphicsitem" CONDITION WIN32 AND NOT WINRT LIBRARIES -luser32) +## Scopes: +##################################################################### + +extend_target(tst_qgraphicsitem CONDITION WIN32 AND NOT WINRT + PUBLIC_LIBRARIES + user32 +) diff --git a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt index 7fe81cb6ea..179b6c8497 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt @@ -1,6 +1,15 @@ -add_qt_test("tst_qgraphicsitemanimation" SOURCES tst_qgraphicsitemanimation.cpp +# Generated from qgraphicsitemanimation.pro. + +##################################################################### +## tst_qgraphicsitemanimation Test: +##################################################################### + +add_qt_test(tst_qgraphicsitemanimation + SOURCES + tst_qgraphicsitemanimation.cpp DEFINES QT_NO_CAST_TO_ASCII - LIBRARIES + PUBLIC_LIBRARIES + Qt::Gui Qt::Widgets ) diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt index 65ae39ae8f..9a149f9df1 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt @@ -1,6 +1,15 @@ -add_qt_test("tst_qgraphicslayout" SOURCES tst_qgraphicslayout.cpp +# Generated from qgraphicslayout.pro. + +##################################################################### +## tst_qgraphicslayout Test: +##################################################################### + +add_qt_test(tst_qgraphicslayout + SOURCES + tst_qgraphicslayout.cpp DEFINES QT_USE_USING_NAMESPACE - LIBRARIES + PUBLIC_LIBRARIES + Qt::Gui Qt::Widgets ) diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt index 8f1e57ea47..56b9f73127 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qgraphicslayoutitem" SOURCES tst_qgraphicslayoutitem.cpp LIBRARIES Qt::Widgets) +# Generated from qgraphicslayoutitem.pro. + +##################################################################### +## tst_qgraphicslayoutitem Test: +##################################################################### + +add_qt_test(tst_qgraphicslayoutitem + SOURCES + tst_qgraphicslayoutitem.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt index b4d4b6630a..1a44be75a1 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qgraphicslinearlayout" SOURCES tst_qgraphicslinearlayout.cpp LIBRARIES Qt::Widgets) +# Generated from qgraphicslinearlayout.pro. + +##################################################################### +## tst_qgraphicslinearlayout Test: +##################################################################### + +add_qt_test(tst_qgraphicslinearlayout + SOURCES + tst_qgraphicslinearlayout.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt index 8d5d7ddfe4..6fd8273708 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt @@ -1 +1,15 @@ -add_qt_test("tst_qgraphicsobject" SOURCES tst_qgraphicsobject.cpp LIBRARIES Qt::Widgets Qt::CorePrivate) +# Generated from qgraphicsobject.pro. + +##################################################################### +## tst_qgraphicsobject Test: +##################################################################### + +add_qt_test(tst_qgraphicsobject + SOURCES + tst_qgraphicsobject.cpp + LIBRARIES + Qt::CorePrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt index d6c87306da..cca35623e8 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qgraphicspixmapitem" SOURCES tst_qgraphicspixmapitem.cpp LIBRARIES Qt::Widgets) +# Generated from qgraphicspixmapitem.pro. + +##################################################################### +## tst_qgraphicspixmapitem Test: +##################################################################### + +add_qt_test(tst_qgraphicspixmapitem + SOURCES + tst_qgraphicspixmapitem.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt index df9f5c71fe..86c6965756 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qgraphicspolygonitem" SOURCES tst_qgraphicspolygonitem.cpp LIBRARIES Qt::Widgets) +# Generated from qgraphicspolygonitem.pro. + +##################################################################### +## tst_qgraphicspolygonitem Test: +##################################################################### + +add_qt_test(tst_qgraphicspolygonitem + SOURCES + tst_qgraphicspolygonitem.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt index 0dd32c50dd..77af1c5a83 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt @@ -1,10 +1,19 @@ -add_qt_test("tst_qgraphicsproxywidget" +# Generated from qgraphicsproxywidget.pro. + +##################################################################### +## tst_qgraphicsproxywidget Test: +##################################################################### + +add_qt_test(tst_qgraphicsproxywidget SOURCES tst_qgraphicsproxywidget.cpp DEFINES QTEST_QPA_MOUSE_HANDLING LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt index e3c0ed8559..ddc377799f 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt @@ -1,15 +1,78 @@ -add_qt_test("tst_qgraphicsscene" +# Generated from qgraphicsscene.pro. + +##################################################################### +## tst_qgraphicsscene Test: +##################################################################### + +add_qt_test(tst_qgraphicsscene SOURCES - images.qrc - testdata.qrc tst_qgraphicsscene.cpp DEFINES - SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" QT_NO_CAST_TO_ASCII + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +# Resources: +set(images_resource_files + "Ash_European.jpg" +) + +add_qt_resource(tst_qgraphicsscene "images" + PREFIX + "/" + FILES + ${images_resource_files} +) +set(testdata_resource_files + "testData/render/all-all-45-deg-left.png" + "testData/render/all-all-45-deg-right.png" + "testData/render/all-all-scale-2x.png" + "testData/render/all-all-translate-0-50.png" + "testData/render/all-all-translate-50-0.png" + "testData/render/all-all-untransformed-clip-ellipse.png" + "testData/render/all-all-untransformed-clip-rect.png" + "testData/render/all-all-untransformed.png" + "testData/render/all-bottomleft-untransformed.png" + "testData/render/all-bottomright-untransformed.png" + "testData/render/all-topleft-untransformed.png" + "testData/render/all-topright-untransformed.png" + "testData/render/bottom-bottomright-untransformed.png" + "testData/render/bottom-topleft-untransformed.png" + "testData/render/bottomleft-all-untransformed.png" + "testData/render/bottomleft-topleft-untransformed.png" + "testData/render/bottomright-all-untransformed.png" + "testData/render/bottomright-topleft-untransformed.png" + "testData/render/left-bottomright-untransformed.png" + "testData/render/left-topleft-untransformed.png" + "testData/render/right-bottomright-untransformed.png" + "testData/render/right-topleft-untransformed.png" + "testData/render/top-bottomright-untransformed.png" + "testData/render/top-topleft-untransformed.png" + "testData/render/topleft-all-untransformed.png" + "testData/render/topleft-topleft-untransformed.png" + "testData/render/topright-all-untransformed.png" + "testData/render/topright-topleft-untransformed.png" +) + +add_qt_resource(tst_qgraphicsscene "testdata" + PREFIX + "/" + FILES + ${testdata_resource_files} ) -extend_target("tst_qgraphicsscene" CONDITION WIN32 AND NOT WINRT LIBRARIES -luser32) + +## Scopes: +##################################################################### + +extend_target(tst_qgraphicsscene CONDITION WIN32 AND NOT WINRT + PUBLIC_LIBRARIES + user32 +) diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt index 127e4d1d2f..b8a5fcd905 100644 --- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt @@ -1,6 +1,24 @@ -add_qt_test("tst_qgraphicssceneindex" SOURCES tst_qgraphicssceneindex.cpp +# Generated from qgraphicssceneindex.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qgraphicssceneindex Test: +##################################################################### + +add_qt_test(tst_qgraphicssceneindex + SOURCES + tst_qgraphicssceneindex.cpp LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) + +#### Keys ignored in scope 1:.:.:qgraphicssceneindex.pro:: +# _REQUIREMENTS = "qtConfig(private_tests)" diff --git a/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt index 638432f39e..450c0269f3 100644 --- a/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qgraphicstransform" SOURCES tst_qgraphicstransform.cpp LIBRARIES Qt::Widgets) +# Generated from qgraphicstransform.pro. + +##################################################################### +## tst_qgraphicstransform Test: +##################################################################### + +add_qt_test(tst_qgraphicstransform + SOURCES + tst_qgraphicstransform.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt index 9541044cfd..22354b9c5e 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt @@ -1,12 +1,24 @@ -add_qt_test("tst_qgraphicsview" +# Generated from qgraphicsview.pro. + +##################################################################### +## tst_qgraphicsview Test: +##################################################################### + +add_qt_test(tst_qgraphicsview SOURCES tst_qgraphicsview.cpp tst_qgraphicsview.h tst_qgraphicsview_2.cpp DEFINES QT_NO_CAST_TO_ASCII LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate Qt::TestPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) + +#### Keys ignored in scope 1:.:.:qgraphicsview.pro:: +# testcase.timeout = "500" diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt index dd84df4758..9c49a957c0 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt @@ -1,6 +1,17 @@ -add_qt_test("tst_qgraphicswidget" SOURCES tst_qgraphicswidget.cpp +# Generated from qgraphicswidget.pro. + +##################################################################### +## tst_qgraphicswidget Test: +##################################################################### + +add_qt_test(tst_qgraphicswidget + SOURCES + tst_qgraphicswidget.cpp LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) -- cgit v1.2.3