From 79c384ebb073066336b4c83cc24d63cdb4ef6fcf Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 21 Oct 2019 09:47:12 +0200 Subject: cmake: add widgets/kernel tests Fixes: QTBUG-78230 Change-Id: Ia59f531f92e1f8499a8e814ff48c36f65984ff2a Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- tests/auto/widgets/kernel/CMakeLists.txt | 6 +-- tests/auto/widgets/kernel/qaction/CMakeLists.txt | 14 ++++++- .../widgets/kernel/qactiongroup/CMakeLists.txt | 14 ++++++- .../widgets/kernel/qapplication/CMakeLists.txt | 7 ++++ .../desktopsettingsaware/CMakeLists.txt | 19 ++++++++++ .../kernel/qapplication/modal/CMakeLists.txt | 20 ++++++++++ .../kernel/qapplication/test/CMakeLists.txt | 44 ++++++++++++++++++++++ .../auto/widgets/kernel/qboxlayout/CMakeLists.txt | 16 +++++++- .../widgets/kernel/qdesktopwidget/CMakeLists.txt | 14 ++++++- .../kernel/qgesturerecognizer/CMakeLists.txt | 16 ++++++-- .../auto/widgets/kernel/qgridlayout/CMakeLists.txt | 3 -- tests/auto/widgets/kernel/qlayout/CMakeLists.txt | 41 +++++++++++++++++++- tests/auto/widgets/kernel/qshortcut/CMakeLists.txt | 16 +++++++- .../auto/widgets/kernel/qsizepolicy/CMakeLists.txt | 19 +++++++++- .../widgets/kernel/qstackedlayout/CMakeLists.txt | 14 ++++++- tests/auto/widgets/kernel/qtooltip/CMakeLists.txt | 14 ++++++- tests/auto/widgets/kernel/qwidget/CMakeLists.txt | 17 ++++++--- .../widgets/kernel/qwidget_window/CMakeLists.txt | 14 ++++++- .../widgets/kernel/qwidgetaction/CMakeLists.txt | 16 +++++++- .../widgets/kernel/qwidgetmetatype/CMakeLists.txt | 14 ++++++- .../widgets/kernel/qwidgetsvariant/CMakeLists.txt | 13 +++++-- .../widgets/kernel/qwindowcontainer/CMakeLists.txt | 14 ++++++- 22 files changed, 330 insertions(+), 35 deletions(-) create mode 100644 tests/auto/widgets/kernel/qapplication/CMakeLists.txt create mode 100644 tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt create mode 100644 tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt create mode 100644 tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/kernel/CMakeLists.txt b/tests/auto/widgets/kernel/CMakeLists.txt index 046f12e014..51759264b2 100644 --- a/tests/auto/widgets/kernel/CMakeLists.txt +++ b/tests/auto/widgets/kernel/CMakeLists.txt @@ -2,7 +2,7 @@ add_subdirectory(qaction) add_subdirectory(qactiongroup) -# add_subdirectory(qapplication) # FIXME: Enable this! +add_subdirectory(qapplication) add_subdirectory(qboxlayout) add_subdirectory(qdesktopwidget) add_subdirectory(qformlayout) @@ -18,10 +18,6 @@ add_subdirectory(qwidgetsvariant) add_subdirectory(qwindowcontainer) add_subdirectory(qshortcut) add_subdirectory(qsizepolicy) -if(OFF) - add_subdirectory(qsound) -endif() - if(NOT APPLE) add_subdirectory(qgesturerecognizer) endif() diff --git a/tests/auto/widgets/kernel/qaction/CMakeLists.txt b/tests/auto/widgets/kernel/qaction/CMakeLists.txt index 8bea25a189..67f98382f1 100644 --- a/tests/auto/widgets/kernel/qaction/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qaction/CMakeLists.txt @@ -1,6 +1,16 @@ -add_qt_test("tst_qaction" SOURCES tst_qaction.cpp +# Generated from qaction.pro. + +##################################################################### +## tst_qaction Test: +##################################################################### + +add_qt_test(tst_qaction + SOURCES + tst_qaction.cpp LIBRARIES - Qt::GuiPrivate Qt::CorePrivate + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui Qt::Widgets ) diff --git a/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt b/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt index 404e1bab60..a55acf2efb 100644 --- a/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qactiongroup" SOURCES tst_qactiongroup.cpp LIBRARIES Qt::Widgets) +# Generated from qactiongroup.pro. + +##################################################################### +## tst_qactiongroup Test: +##################################################################### + +add_qt_test(tst_qactiongroup + SOURCES + tst_qactiongroup.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/kernel/qapplication/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/CMakeLists.txt new file mode 100644 index 0000000000..8e68089f5e --- /dev/null +++ b/tests/auto/widgets/kernel/qapplication/CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from qapplication.pro. + +add_subdirectory(test) +if(NOT WINRT) + add_subdirectory(desktopsettingsaware) + add_subdirectory(modal) +endif() diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt new file mode 100644 index 0000000000..3cde934dde --- /dev/null +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from desktopsettingsaware.pro. + +##################################################################### +## desktopsettingsaware Binary: +##################################################################### + +add_qt_executable(desktopsettingsaware_helper # special case + GUI + SOURCES + main.cpp + OUTPUT_DIRECTORY # special case + ${CMAKE_CURRENT_BINARY_DIR}/.. # special case + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +## Scopes: +##################################################################### diff --git a/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt new file mode 100644 index 0000000000..e749d74975 --- /dev/null +++ b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from modal.pro. + +##################################################################### +## modal Binary: +##################################################################### + +add_qt_executable(modal_helper # special case + GUI + SOURCES + base.cpp base.h + main.cpp + OUTPUT_DIRECTORY # special case + ${CMAKE_CURRENT_BINARY_DIR}/.. # special case + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +## Scopes: +##################################################################### diff --git a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt new file mode 100644 index 0000000000..313e7e9225 --- /dev/null +++ b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from test.pro. + +##################################################################### +## test Test: +##################################################################### + +# Collect test data +list(APPEND test_data "../test/test.pro") +list(APPEND test_data "../tmp/README") +list(APPEND test_data "../modal") + +add_qt_test(tst_qapplication + SOURCES + ../tst_qapplication.cpp + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + TESTDATA ${test_data} + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case +) + +## Scopes: +##################################################################### + +extend_target(tst_qapplication CONDITION builtin_testdata # special case + DEFINES + BUILTIN_TESTDATA +) + +#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID AND NOT WINRT: +# SUBPROGRAMS = "desktopsettingsaware" "modal" + +#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT: +# TEST_HELPER_INSTALLS = "../debug/helper" + +#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID AND NOT WINRT: +# TEST_HELPER_INSTALLS = "../release/helper" + +#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID AND NOT WINRT: +# TEST_HELPER_INSTALLS = "../helper" diff --git a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt index 0fb220514b..dca063e2f0 100644 --- a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt @@ -1 +1,15 @@ -add_qt_test("tst_qboxlayout" SOURCES tst_qboxlayout.cpp LIBRARIES Qt::Widgets Qt::TestPrivate) +# Generated from qboxlayout.pro. + +##################################################################### +## tst_qboxlayout Test: +##################################################################### + +add_qt_test(tst_qboxlayout + SOURCES + tst_qboxlayout.cpp + LIBRARIES + Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/kernel/qdesktopwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qdesktopwidget/CMakeLists.txt index 6cfea9d4f4..79790049fe 100644 --- a/tests/auto/widgets/kernel/qdesktopwidget/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qdesktopwidget/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qdesktopwidget" SOURCES tst_qdesktopwidget.cpp LIBRARIES Qt::Widgets) +# Generated from qdesktopwidget.pro. + +##################################################################### +## tst_qdesktopwidget Test: +##################################################################### + +add_qt_test(tst_qdesktopwidget + SOURCES + tst_qdesktopwidget.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt index fe47f9bcd6..7041320dd0 100644 --- a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt @@ -1,6 +1,16 @@ -add_qt_test("tst_qgesturerecognizer" SOURCES tst_qgesturerecognizer.cpp +# Generated from qgesturerecognizer.pro. + +##################################################################### +## tst_qgesturerecognizer Test: +##################################################################### + +add_qt_test(tst_qgesturerecognizer + SOURCES + tst_qgesturerecognizer.cpp LIBRARIES - Qt::Widgets - Qt::GuiPrivate Qt::CorePrivate + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) diff --git a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt index c879f7306e..86661e505a 100644 --- a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt @@ -19,6 +19,3 @@ add_qt_test(tst_qgridlayout ENABLE_AUTOGEN_TOOLS uic ) - -#### Keys ignored in scope 1:.:.:qgridlayout.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt index a9b80c1287..2a3526722e 100644 --- a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt @@ -1,3 +1,40 @@ -add_qt_test("tst_qlayout" SOURCES tst_qlayout.cpp LIBRARIES Qt::WidgetsPrivate Qt::TestPrivate) +# Generated from qlayout.pro. -extend_target("tst_qlayout" CONDITION ANDROID AND NOT ANDROID_EMBEDDED SOURCES testdata.qrc) +##################################################################### +## tst_qlayout Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + baseline/*) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qlayout + SOURCES + tst_qlayout.cpp + LIBRARIES + Qt::TestPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +if(ANDROID AND NOT ANDROID_EMBEDDED) + # Resources: + set(testdata_resource_files + "baseline/smartmaxsize" + ) + + add_qt_resource(tst_qlayout "testdata" + PREFIX + "/" + FILES + ${testdata_resource_files} + ) +endif() diff --git a/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt b/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt index d71f1aae6c..5d077c87ec 100644 --- a/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt @@ -1 +1,15 @@ -add_qt_test("tst_qshortcut" SOURCES tst_qshortcut.cpp LIBRARIES Qt::Widgets) +# Generated from qshortcut.pro. + +##################################################################### +## tst_qshortcut Test: +##################################################################### + +add_qt_test(tst_qshortcut + SOURCES + tst_qshortcut.cpp + INCLUDE_DIRECTORIES + .. + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt index 32b17c8bba..440421a3ea 100644 --- a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt @@ -1 +1,18 @@ -add_qt_test("tst_qsizepolicy" SOURCES tst_qsizepolicy.cpp LIBRARIES Qt::WidgetsPrivate) +# Generated from qsizepolicy.pro. + +##################################################################### +## tst_qsizepolicy Test: +##################################################################### + +add_qt_test(tst_qsizepolicy + SOURCES + tst_qsizepolicy.cpp + LIBRARIES + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +## Scopes: +##################################################################### diff --git a/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt index 24c681dc45..a41957c9a6 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qstackedlayout" SOURCES tst_qstackedlayout.cpp LIBRARIES Qt::Widgets) +# Generated from qstackedlayout.pro. + +##################################################################### +## tst_qstackedlayout Test: +##################################################################### + +add_qt_test(tst_qstackedlayout + SOURCES + tst_qstackedlayout.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt b/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt index e5cdace275..f63b6e63cd 100644 --- a/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qtooltip" SOURCES tst_qtooltip.cpp LIBRARIES Qt::Widgets) +# Generated from qtooltip.pro. + +##################################################################### +## tst_qtooltip Test: +##################################################################### + +add_qt_test(tst_qtooltip + SOURCES + tst_qtooltip.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt index fca2c313a1..df2056476b 100644 --- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qwidget - GUI SOURCES tst_qwidget.cpp LIBRARIES @@ -19,23 +18,31 @@ add_qt_test(tst_qwidget ) # Resources: +set(qwidget_resource_files + "geometry-fullscreen.dat" + "geometry-maximized.dat" + "geometry.dat" +) + add_qt_resource(tst_qwidget "qwidget" PREFIX "/" FILES - geometry-fullscreen.dat - geometry-maximized.dat - geometry.dat + ${qwidget_resource_files} ) #### Keys ignored in scope 1:.:.:qwidget.pro:: -# CONFIG = "testcase" "x11inc" # testcase.timeout = "600" ## Scopes: ##################################################################### +extend_target(tst_qwidget CONDITION AIX + COMPILE_OPTIONS + -fpermissive +) + extend_target(tst_qwidget CONDITION APPLE SOURCES tst_qwidget_mac_helpers.mm diff --git a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt index 9d16c40be4..c3fc672c17 100644 --- a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt @@ -1,7 +1,17 @@ -add_qt_test("tst_qwidget_window" SOURCES tst_qwidget_window.cpp +# Generated from qwidget_window.pro. + +##################################################################### +## tst_qwidget_window Test: +##################################################################### + +add_qt_test(tst_qwidget_window + SOURCES + tst_qwidget_window.cpp LIBRARIES - Qt::Widgets Qt::CorePrivate Qt::GuiPrivate Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) diff --git a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt index d58853790e..887ecda4af 100644 --- a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt @@ -1 +1,15 @@ -add_qt_test("tst_qwidgetaction" SOURCES tst_qwidgetaction.cpp LIBRARIES Qt::Widgets Qt::TestPrivate) +# Generated from qwidgetaction.pro. + +##################################################################### +## tst_qwidgetaction Test: +##################################################################### + +add_qt_test(tst_qwidgetaction + SOURCES + tst_qwidgetaction.cpp + LIBRARIES + Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt index ab69449fba..dd935fdbd7 100644 --- a/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qwidgetmetatype" SOURCES tst_qwidgetmetatype.cpp LIBRARIES Qt::Widgets) +# Generated from qwidgetmetatype.pro. + +##################################################################### +## tst_qwidgetmetatype Test: +##################################################################### + +add_qt_test(tst_qwidgetmetatype + SOURCES + tst_qwidgetmetatype.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt index 53a479ef80..076f66cd78 100644 --- a/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt @@ -1,8 +1,15 @@ -add_qt_test("tst_qwidgetsvariant" +# Generated from qwidgetsvariant.pro. + +##################################################################### +## tst_qwidgetsvariant Test: +##################################################################### + +add_qt_test(tst_qwidgetsvariant SOURCES tst_qwidgetsvariant.cpp INCLUDE_DIRECTORIES - ./../../../other/qvariant_common - LIBRARIES + ../../../other/qvariant_common + PUBLIC_LIBRARIES + Qt::Gui Qt::Widgets ) diff --git a/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt b/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt index 329260bd05..63b8b44e6f 100644 --- a/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qwindowcontainer" SOURCES tst_qwindowcontainer.cpp LIBRARIES Qt::Widgets) +# Generated from qwindowcontainer.pro. + +##################################################################### +## tst_qwindowcontainer Test: +##################################################################### + +add_qt_test(tst_qwindowcontainer + SOURCES + tst_qwindowcontainer.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) -- cgit v1.2.3