From a3bd80c08cd046d892c666098093ec20fc9e1321 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 21 Sep 2020 19:30:19 +0200 Subject: CMake: Regenerate projects Clean up the state of the projects, before changing the internal CMake API function names. Task-number: QTBUG-86815 Change-Id: I90f1b21b8ae4439a4a293872c3bb728dab44a50d Reviewed-by: Joerg Bornemann --- .../qgraphicsscene/.prev_CMakeLists.txt | 77 ++++++++++++++++++++++ .../graphicsview/qgraphicsscene/CMakeLists.txt | 2 +- .../widgets/widgets/qframe/.prev_CMakeLists.txt | 20 ++++++ tests/auto/widgets/widgets/qframe/CMakeLists.txt | 2 +- .../widgets/qopenglwidget/.prev_CMakeLists.txt | 18 +++++ .../widgets/widgets/qopenglwidget/CMakeLists.txt | 2 +- 6 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt new file mode 100644 index 0000000000..3208cf2b36 --- /dev/null +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt @@ -0,0 +1,77 @@ +# Generated from qgraphicsscene.pro. + +##################################################################### +## tst_qgraphicsscene Test: +##################################################################### + +qt_add_test(tst_qgraphicsscene + SOURCES + tst_qgraphicsscene.cpp + DEFINES + QT_NO_CAST_TO_ASCII + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets + Qt::WidgetsPrivate +) + +# Resources: +set(images_resource_files + "Ash_European.jpg" +) + +qt_add_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" +) + +qt_add_resource(tst_qgraphicsscene "testdata" + PREFIX + "/" + FILES + ${testdata_resource_files} +) + + +## Scopes: +##################################################################### + +qt_extend_target(tst_qgraphicsscene CONDITION WIN32 + PUBLIC_LIBRARIES + user32 +) diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt index f0865f6a37..b17d328446 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_add_test(tst_qgraphicsscene - LOWDPI + LOWDPI # special case SOURCES tst_qgraphicsscene.cpp DEFINES diff --git a/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt new file mode 100644 index 0000000000..89f91d1967 --- /dev/null +++ b/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qframe.pro. + +##################################################################### +## tst_qframe Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + images/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qframe + SOURCES + tst_qframe.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + TESTDATA ${test_data} +) diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt index ac53d07fbd..be08a9b797 100644 --- a/tests/auto/widgets/widgets/qframe/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt @@ -11,7 +11,7 @@ file(GLOB_RECURSE test_data_glob list(APPEND test_data ${test_data_glob}) qt_add_test(tst_qframe - LOWDPI + LOWDPI # special case SOURCES tst_qframe.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt new file mode 100644 index 0000000000..d1af2e811c --- /dev/null +++ b/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qopenglwidget.pro. + +##################################################################### +## tst_qopenglwidget Test: +##################################################################### + +qt_add_test(tst_qopenglwidget + SOURCES + tst_qopenglwidget.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::OpenGL + Qt::OpenGLPrivate + Qt::OpenGLWidgets + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 062a468c6c..036f3316d9 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_add_test(tst_qopenglwidget - LOWDPI + LOWDPI # special case SOURCES tst_qopenglwidget.cpp PUBLIC_LIBRARIES -- cgit v1.2.3