From e9c45bbdddd4df005bdaa5eea9740d351e6eaea2 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 24 Oct 2018 15:20:27 +0200 Subject: Begin port of qtbase to CMake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Done-by: Alexandru Croitor Done-by: Frederik Gladhorn Done-by: Kevin Funk Done-by: Mikhail Svetkin Done-by: Simon Hausmann Done-by: Tobias Hunger Done-by: Tor Arne Vestbø Done-by: Volker Krause Change-Id: Ida4f8bd190f9a4849a1af7b5b7981337a5df5310 Reviewed-by: Simon Hausmann Reviewed-by: Tobias Hunger Reviewed-by: Mikhail Svetkin --- tests/auto/widgets/widgets/CMakeLists.txt | 55 ++++++++++++++++++++++ .../widgets/widgets/qabstractbutton/CMakeLists.txt | 1 + .../widgets/qabstractscrollarea/CMakeLists.txt | 1 + .../widgets/widgets/qabstractslider/CMakeLists.txt | 1 + .../widgets/qabstractspinbox/CMakeLists.txt | 7 +++ .../widgets/widgets/qbuttongroup/CMakeLists.txt | 1 + .../widgets/widgets/qcalendarwidget/CMakeLists.txt | 1 + .../auto/widgets/widgets/qcheckbox/CMakeLists.txt | 1 + .../auto/widgets/widgets/qcombobox/CMakeLists.txt | 8 ++++ .../widgets/qcommandlinkbutton/CMakeLists.txt | 1 + .../widgets/widgets/qdatetimeedit/CMakeLists.txt | 6 +++ tests/auto/widgets/widgets/qdial/CMakeLists.txt | 1 + .../widgets/qdialogbuttonbox/CMakeLists.txt | 1 + .../widgets/widgets/qdockwidget/CMakeLists.txt | 6 +++ .../widgets/widgets/qdoublespinbox/CMakeLists.txt | 1 + .../widgets/widgets/qfocusframe/CMakeLists.txt | 1 + .../widgets/widgets/qfontcombobox/CMakeLists.txt | 1 + tests/auto/widgets/widgets/qframe/CMakeLists.txt | 1 + .../auto/widgets/widgets/qgroupbox/CMakeLists.txt | 1 + .../widgets/qkeysequenceedit/CMakeLists.txt | 1 + tests/auto/widgets/widgets/qlabel/CMakeLists.txt | 6 +++ .../auto/widgets/widgets/qlcdnumber/CMakeLists.txt | 1 + .../auto/widgets/widgets/qlineedit/CMakeLists.txt | 9 ++++ .../widgets/widgets/qmainwindow/CMakeLists.txt | 1 + tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt | 14 ++++++ .../widgets/widgets/qmdisubwindow/CMakeLists.txt | 7 +++ tests/auto/widgets/widgets/qmenu/CMakeLists.txt | 13 +++++ tests/auto/widgets/widgets/qmenubar/CMakeLists.txt | 6 +++ .../widgets/widgets/qopenglwidget/CMakeLists.txt | 6 +++ .../widgets/widgets/qplaintextedit/CMakeLists.txt | 7 +++ .../widgets/widgets/qprogressbar/CMakeLists.txt | 1 + .../widgets/widgets/qpushbutton/CMakeLists.txt | 1 + .../widgets/widgets/qradiobutton/CMakeLists.txt | 1 + .../widgets/widgets/qscrollarea/CMakeLists.txt | 1 + .../auto/widgets/widgets/qscrollbar/CMakeLists.txt | 1 + .../auto/widgets/widgets/qsizegrip/CMakeLists.txt | 1 + tests/auto/widgets/widgets/qslider/CMakeLists.txt | 1 + tests/auto/widgets/widgets/qspinbox/CMakeLists.txt | 1 + .../widgets/widgets/qsplashscreen/CMakeLists.txt | 1 + .../auto/widgets/widgets/qsplitter/CMakeLists.txt | 1 + .../widgets/widgets/qstackedwidget/CMakeLists.txt | 1 + .../auto/widgets/widgets/qstatusbar/CMakeLists.txt | 1 + tests/auto/widgets/widgets/qtabbar/CMakeLists.txt | 1 + .../auto/widgets/widgets/qtabwidget/CMakeLists.txt | 3 ++ .../widgets/widgets/qtextbrowser/CMakeLists.txt | 3 ++ .../auto/widgets/widgets/qtextedit/CMakeLists.txt | 8 ++++ tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt | 1 + tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt | 1 + .../widgets/widgets/qtoolbutton/CMakeLists.txt | 1 + 49 files changed, 197 insertions(+) create mode 100644 tests/auto/widgets/widgets/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qcombobox/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qdial/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qframe/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qlabel/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qlineedit/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qmenu/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qmenubar/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qslider/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qspinbox/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qsplitter/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qtabbar/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qtextedit/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/CMakeLists.txt b/tests/auto/widgets/widgets/CMakeLists.txt new file mode 100644 index 0000000000..60776f5da2 --- /dev/null +++ b/tests/auto/widgets/widgets/CMakeLists.txt @@ -0,0 +1,55 @@ +# Generated from widgets.pro. + +add_subdirectory(qabstractbutton) +add_subdirectory(qabstractscrollarea) +add_subdirectory(qabstractslider) +add_subdirectory(qbuttongroup) +add_subdirectory(qcalendarwidget) +add_subdirectory(qcheckbox) +add_subdirectory(qcommandlinkbutton) +add_subdirectory(qdatetimeedit) +add_subdirectory(qdial) +add_subdirectory(qdialogbuttonbox) +add_subdirectory(qdockwidget) +add_subdirectory(qdoublespinbox) +add_subdirectory(qfocusframe) +add_subdirectory(qfontcombobox) +add_subdirectory(qframe) +add_subdirectory(qgroupbox) +add_subdirectory(qkeysequenceedit) +add_subdirectory(qlabel) +add_subdirectory(qlcdnumber) +add_subdirectory(qlineedit) +add_subdirectory(qmdiarea) +add_subdirectory(qmdisubwindow) +add_subdirectory(qmenu) +add_subdirectory(qmenubar) +add_subdirectory(qplaintextedit) +add_subdirectory(qprogressbar) +add_subdirectory(qpushbutton) +add_subdirectory(qradiobutton) +add_subdirectory(qscrollarea) +add_subdirectory(qscrollbar) +add_subdirectory(qsizegrip) +add_subdirectory(qslider) +add_subdirectory(qspinbox) +add_subdirectory(qsplitter) +add_subdirectory(qstackedwidget) +add_subdirectory(qstatusbar) +add_subdirectory(qtabbar) +add_subdirectory(qtabwidget) +add_subdirectory(qtextbrowser) +add_subdirectory(qtoolbox) +add_subdirectory(qtoolbutton) + +if(QT_FEATURE_private_tests) + add_subdirectory(qabstractspinbox) + add_subdirectory(qcombobox) + add_subdirectory(qmainwindow) + add_subdirectory(qtextedit) + add_subdirectory(qtoolbar) +endif() + +if(NOT WINRT AND QT_FEATURE_opengl) + add_subdirectory(qopenglwidget) +endif() diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt new file mode 100644 index 0000000000..7b2123b530 --- /dev/null +++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qabstractbutton" RUN_SERIAL SOURCES tst_qabstractbutton.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt new file mode 100644 index 0000000000..a003346393 --- /dev/null +++ b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qabstractscrollarea" RUN_SERIAL SOURCES tst_qabstractscrollarea.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt new file mode 100644 index 0000000000..6974ae4172 --- /dev/null +++ b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qabstractslider" RUN_SERIAL SOURCES tst_qabstractslider.cpp LIBRARIES Qt::Widgets Qt::TestPrivate) diff --git a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt new file mode 100644 index 0000000000..88c69d370b --- /dev/null +++ b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt @@ -0,0 +1,7 @@ +add_qt_test("tst_qabstractspinbox" RUN_SERIAL SOURCES tst_qabstractspinbox.cpp + LIBRARIES + Qt::Widgets + Qt::GuiPrivate + Qt::CorePrivate + Qt::TestPrivate +) diff --git a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt new file mode 100644 index 0000000000..37b2196705 --- /dev/null +++ b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qbuttongroup" RUN_SERIAL SOURCES tst_qbuttongroup.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt new file mode 100644 index 0000000000..4aad3abff9 --- /dev/null +++ b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qcalendarwidget" RUN_SERIAL SOURCES tst_qcalendarwidget.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt new file mode 100644 index 0000000000..2640889d94 --- /dev/null +++ b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qcheckbox" RUN_SERIAL SOURCES tst_qcheckbox.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt new file mode 100644 index 0000000000..8697a67820 --- /dev/null +++ b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt @@ -0,0 +1,8 @@ +add_qt_test("tst_qcombobox" RUN_SERIAL SOURCES tst_qcombobox.cpp + DEFINES QTEST_QPA_MOUSE_HANDLING + LIBRARIES + Qt::WidgetsPrivate + Qt::GuiPrivate + Qt::CorePrivate + Qt::TestPrivate +) diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt new file mode 100644 index 0000000000..2893e2d0f3 --- /dev/null +++ b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qcommandlinkbutton" RUN_SERIAL SOURCES tst_qcommandlinkbutton.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt new file mode 100644 index 0000000000..1f977399ac --- /dev/null +++ b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test("tst_qdatetimeedit" RUN_SERIAL SOURCES tst_qdatetimeedit.cpp + LIBRARIES + Qt::Widgets + Qt::CorePrivate + Qt::WidgetsPrivate +) diff --git a/tests/auto/widgets/widgets/qdial/CMakeLists.txt b/tests/auto/widgets/widgets/qdial/CMakeLists.txt new file mode 100644 index 0000000000..76fc75d85a --- /dev/null +++ b/tests/auto/widgets/widgets/qdial/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qdial" RUN_SERIAL SOURCES tst_qdial.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt new file mode 100644 index 0000000000..032189307c --- /dev/null +++ b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qdialogbuttonbox" RUN_SERIAL SOURCES tst_qdialogbuttonbox.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt new file mode 100644 index 0000000000..4bbe5234d9 --- /dev/null +++ b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test("tst_qdockwidget" RUN_SERIAL SOURCES tst_qdockwidget.cpp + LIBRARIES + Qt::WidgetsPrivate + Qt::CorePrivate + Qt::GuiPrivate +) diff --git a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt new file mode 100644 index 0000000000..8030b82b42 --- /dev/null +++ b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qdoublespinbox" RUN_SERIAL SOURCES tst_qdoublespinbox.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt new file mode 100644 index 0000000000..1aac33f254 --- /dev/null +++ b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qfocusframe" RUN_SERIAL SOURCES tst_qfocusframe.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt new file mode 100644 index 0000000000..6bb659cca2 --- /dev/null +++ b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qfontcombobox" RUN_SERIAL SOURCES tst_qfontcombobox.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt new file mode 100644 index 0000000000..f109c76d0d --- /dev/null +++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qframe" RUN_SERIAL SOURCES tst_qframe.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt new file mode 100644 index 0000000000..5885420d31 --- /dev/null +++ b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qgroupbox" RUN_SERIAL SOURCES tst_qgroupbox.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt new file mode 100644 index 0000000000..415b49dd1b --- /dev/null +++ b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qkeysequenceedit" RUN_SERIAL SOURCES tst_qkeysequenceedit.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt new file mode 100644 index 0000000000..91ce86552a --- /dev/null +++ b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test("tst_qlabel" RUN_SERIAL SOURCES tst_qlabel.cpp + LIBRARIES + Qt::WidgetsPrivate + Qt::CorePrivate + Qt::GuiPrivate +) diff --git a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt new file mode 100644 index 0000000000..4f748f0ae8 --- /dev/null +++ b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qlcdnumber" RUN_SERIAL SOURCES tst_qlcdnumber.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt new file mode 100644 index 0000000000..626b9fc403 --- /dev/null +++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt @@ -0,0 +1,9 @@ +add_qt_test("tst_qlineedit" RUN_SERIAL SOURCES tst_qlineedit.cpp + LIBRARIES + Qt::GuiPrivate + Qt::CorePrivate + Qt::WidgetsPrivate + Qt::TestPrivate +) + +extend_target("tst_qlineedit" CONDITION APPLE_OSX LIBRARIES FWAppKit) diff --git a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt new file mode 100644 index 0000000000..f1756bd342 --- /dev/null +++ b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qmainwindow" RUN_SERIAL SOURCES tst_qmainwindow.cpp LIBRARIES Qt::WidgetsPrivate) diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt new file mode 100644 index 0000000000..b14730c588 --- /dev/null +++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt @@ -0,0 +1,14 @@ +qt_pull_features_into_current_scope(PUBLIC_FEATURES Qt::Gui) + +add_qt_test("tst_qmdiarea" RUN_SERIAL SOURCES tst_qmdiarea.cpp + DEFINES + QT_NO_CAST_TO_ASCII + QT_NO_CAST_FROM_ASCII + LIBRARIES + Qt::GuiPrivate + Qt::Widgets +) + +extend_target("tst_qmdiarea" CONDITION TARGET Qt::OpenGL LIBRARIES Qt::OpenGL) + +extend_target("tst_qmdiarea" CONDITION APPLE_OSX LIBRARIES FWSecurity) diff --git a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt new file mode 100644 index 0000000000..c095ccebd0 --- /dev/null +++ b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt @@ -0,0 +1,7 @@ +add_qt_test("tst_qmdisubwindow" RUN_SERIAL SOURCES tst_qmdisubwindow.cpp + DEFINES + QT_NO_CAST_TO_ASCII + QT_NO_CAST_FROM_ASCII + LIBRARIES + Qt::WidgetsPrivate +) diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt new file mode 100644 index 0000000000..6e9da6d474 --- /dev/null +++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt @@ -0,0 +1,13 @@ +add_qt_test("tst_qmenu" RUN_SERIAL SOURCES tst_qmenu.cpp + LIBRARIES + Qt::GuiPrivate + Qt::Widgets + Qt::TestPrivate +) + +extend_target("tst_qmenu" CONDITION APPLE_OSX + SOURCES tst_qmenu_mac.mm + LIBRARIES -lobjc +) + +extend_target("tst_qmenu" CONDITION NOT APPLEL_OSX DEFINES QTEST_QPA_MOUSE_HANDLING) diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt new file mode 100644 index 0000000000..84878c7ec8 --- /dev/null +++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test("tst_qmenubar" RUN_SERIAL SOURCES tst_qmenubar.cpp LIBRARIES Qt::Widgets Qt::TestPrivate) + +extend_target("tst_qmenubar" CONDITION APPLE_OSX + SOURCES tst_qmenubar_mac.mm + LIBRARIES FWAppKit +) diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt new file mode 100644 index 0000000000..a9172dec4f --- /dev/null +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test("tst_qopenglwidget" RUN_SERIAL SOURCES tst_qopenglwidget.cpp + LIBRARIES + Qt::GuiPrivate + Qt::CorePrivate + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt new file mode 100644 index 0000000000..d05e0aa8c6 --- /dev/null +++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt @@ -0,0 +1,7 @@ +add_qt_test("tst_qplaintextedit" RUN_SERIAL SOURCES tst_qplaintextedit.cpp + LIBRARIES + Qt::WidgetsPrivate + Qt::GuiPrivate +) + +extend_target("tst_qplaintextedit" CONDITION APPLE_OSX LIBRARIES FWAppKit) diff --git a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt new file mode 100644 index 0000000000..5fb9e79056 --- /dev/null +++ b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qprogressbar" RUN_SERIAL SOURCES tst_qprogressbar.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt new file mode 100644 index 0000000000..7b78b96844 --- /dev/null +++ b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qpushbutton" RUN_SERIAL SOURCES tst_qpushbutton.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt new file mode 100644 index 0000000000..08322899a2 --- /dev/null +++ b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qradiobutton" RUN_SERIAL SOURCES tst_qradiobutton.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt new file mode 100644 index 0000000000..b21a9755d4 --- /dev/null +++ b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qscrollarea" RUN_SERIAL SOURCES tst_qscrollarea.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt new file mode 100644 index 0000000000..88163f38c3 --- /dev/null +++ b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qscrollbar" RUN_SERIAL SOURCES tst_qscrollbar.cpp LIBRARIES Qt::Widgets Qt::TestPrivate) diff --git a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt new file mode 100644 index 0000000000..f3f6548774 --- /dev/null +++ b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qsizegrip" RUN_SERIAL SOURCES tst_qsizegrip.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qslider/CMakeLists.txt b/tests/auto/widgets/widgets/qslider/CMakeLists.txt new file mode 100644 index 0000000000..1da3dc0d0a --- /dev/null +++ b/tests/auto/widgets/widgets/qslider/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qslider" RUN_SERIAL SOURCES tst_qslider.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt new file mode 100644 index 0000000000..80f1de0702 --- /dev/null +++ b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qspinbox" RUN_SERIAL SOURCES tst_qspinbox.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt new file mode 100644 index 0000000000..028d8fc82e --- /dev/null +++ b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qsplashscreen" RUN_SERIAL SOURCES tst_qsplashscreen.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt new file mode 100644 index 0000000000..a0dfd3a9c5 --- /dev/null +++ b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qsplitter" RUN_SERIAL SOURCES tst_qsplitter.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt new file mode 100644 index 0000000000..8b2b79b181 --- /dev/null +++ b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qstackedwidget" RUN_SERIAL SOURCES tst_qstackedwidget.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt new file mode 100644 index 0000000000..ba65925b6e --- /dev/null +++ b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qstatusbar" RUN_SERIAL SOURCES tst_qstatusbar.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt new file mode 100644 index 0000000000..003d4a778b --- /dev/null +++ b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qtabbar" RUN_SERIAL SOURCES tst_qtabbar.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt new file mode 100644 index 0000000000..440603fac4 --- /dev/null +++ b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt @@ -0,0 +1,3 @@ +add_qt_test("tst_qtabwidget" RUN_SERIAL SOURCES tst_qtabwidget.cpp LIBRARIES Qt::WidgetsPrivate) + +extend_target("tst_qtabwidget" CONDITION WIN32 AND NOT WINRT LIBRARIES -luser32) diff --git a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt new file mode 100644 index 0000000000..15601c9855 --- /dev/null +++ b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt @@ -0,0 +1,3 @@ +add_qt_test("tst_qtextbrowser" RUN_SERIAL SOURCES tst_qtextbrowser.cpp LIBRARIES Qt::Widgets) + +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 new file mode 100644 index 0000000000..1a8e79e055 --- /dev/null +++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt @@ -0,0 +1,8 @@ +add_qt_test("tst_qtextedit" RUN_SERIAL SOURCES tst_qtextedit.cpp + LIBRARIES + Qt::WidgetsPrivate + Qt::GuiPrivate + Qt::CorePrivate +) + +extend_target("tst_qtextedit" CONDITION APPLE_OSX LIBRARIES FWAppKit) diff --git a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt new file mode 100644 index 0000000000..ab6d4d082a --- /dev/null +++ b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qtoolbar" RUN_SERIAL SOURCES tst_qtoolbar.cpp LIBRARIES Qt::WidgetsPrivate Qt::GuiPrivate) diff --git a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt new file mode 100644 index 0000000000..337f187878 --- /dev/null +++ b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qtoolbox" RUN_SERIAL SOURCES tst_qtoolbox.cpp LIBRARIES Qt::Widgets) diff --git a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt new file mode 100644 index 0000000000..a253255617 --- /dev/null +++ b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test("tst_qtoolbutton" RUN_SERIAL SOURCES tst_qtoolbutton.cpp LIBRARIES Qt::Widgets) -- cgit v1.2.3 From 6a1ee4de07cbaaeb0583b191fee6258e0a4003e4 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 14 Jan 2019 11:35:53 +0100 Subject: CMake: Store Qt features in CMake Cache This is less self-contained than what we have, but significantly speeds up cmake configure/generate runs. This patch also warns when a feature is already defined. Change-Id: I8cab63e208ba98756b47d362a39b462f5ec55e20 Reviewed-by: Simon Hausmann --- tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt index b14730c588..ca3bf2afa1 100644 --- a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt @@ -1,5 +1,3 @@ -qt_pull_features_into_current_scope(PUBLIC_FEATURES Qt::Gui) - add_qt_test("tst_qmdiarea" RUN_SERIAL SOURCES tst_qmdiarea.cpp DEFINES QT_NO_CAST_TO_ASCII @@ -10,5 +8,4 @@ add_qt_test("tst_qmdiarea" RUN_SERIAL SOURCES tst_qmdiarea.cpp ) extend_target("tst_qmdiarea" CONDITION TARGET Qt::OpenGL LIBRARIES Qt::OpenGL) - extend_target("tst_qmdiarea" CONDITION APPLE_OSX LIBRARIES FWSecurity) -- cgit v1.2.3 From 4f6eb43898aa14fef5f3a54966b340188271d85e Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 12 May 2019 21:30:10 +0200 Subject: QtCore: mark obsolete enumerations as deprecated The following enumerations were obsolete for a log time but not marked as deprecated: - WA_NoBackground - WA_MacNoClickThrough - WA_MacBrushedMetal - WA_MacMetalStyle - WA_MSWindowsUseDirect3D - WA_MacFrameworkScaled - AA_MSWindowsUseDirect3DByDefault - AA_X11InitThreads - ImMicroFocus mark them as deprecated and remove the usage inside QtBase so they can be removed with Qt6 Change-Id: Ia087a7e1d0ff1945286895be6425a6cceaa483fb Reviewed-by: Friedemann Kleint Reviewed-by: Richard Moe Gustavsen --- tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 2 +- tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 7861065de9..f1bc3e8dd4 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -3996,7 +3996,7 @@ void tst_QLineEdit::QTBUG7174_inputMaskCursorBlink() edit.setFocus(); edit.setText(QLatin1String("AAAA")); edit.show(); - QRect cursorRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect(); + QRect cursorRect = edit.inputMethodQuery(Qt::ImCursorRectangle).toRect(); QVERIFY(QTest::qWaitForWindowExposed(&edit)); edit.updateRegion = QRegion(); QTest::qWait(QApplication::cursorFlashTime()); diff --git a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp index d1923e4bb0..9f08bd337b 100644 --- a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp +++ b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp @@ -87,7 +87,7 @@ public: protected: QVariant inputMethodQuery(Qt::InputMethodQuery query) const { - if (query == Qt::ImMicroFocus) + if (query == Qt::ImCursorRectangle) return QRect(width() / 2, height() / 2, 5, 5); return QWidget::inputMethodQuery(query); } @@ -110,7 +110,7 @@ void tst_QScrollArea::ensureMicroFocusVisible_Task_167838() parent->resize(300, 300); scrollArea.setWidget(parent); scrollArea.ensureWidgetVisible(child, 10, 10); - QRect microFocus = child->inputMethodQuery(Qt::ImMicroFocus).toRect(); + QRect microFocus = child->inputMethodQuery(Qt::ImCursorRectangle).toRect(); QPoint p = child->mapTo(scrollArea.viewport(), microFocus.topLeft()); microFocus.translate(p - microFocus.topLeft()); QVERIFY(scrollArea.viewport()->rect().contains(microFocus)); -- cgit v1.2.3 From 07f922286c9224b2999e8fc721ab5f180542eb8c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 27 Feb 2019 17:09:52 +0100 Subject: Fix building tests on macOS Change-Id: I15a83d5abf9e8fa541ff3ca60bd8243f5f4b85e3 Reviewed-by: Simon Hausmann --- tests/auto/widgets/widgets/qlineedit/CMakeLists.txt | 2 +- tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt | 2 +- tests/auto/widgets/widgets/qmenubar/CMakeLists.txt | 2 +- tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt index 626b9fc403..00e0c1d575 100644 --- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt @@ -6,4 +6,4 @@ add_qt_test("tst_qlineedit" RUN_SERIAL SOURCES tst_qlineedit.cpp Qt::TestPrivate ) -extend_target("tst_qlineedit" CONDITION APPLE_OSX LIBRARIES FWAppKit) +extend_target("tst_qlineedit" CONDITION APPLE_OSX LIBRARIES ${FWAppKit}) diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt index ca3bf2afa1..0f32c0ebce 100644 --- a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt @@ -8,4 +8,4 @@ add_qt_test("tst_qmdiarea" RUN_SERIAL SOURCES tst_qmdiarea.cpp ) extend_target("tst_qmdiarea" CONDITION TARGET Qt::OpenGL LIBRARIES Qt::OpenGL) -extend_target("tst_qmdiarea" CONDITION APPLE_OSX LIBRARIES FWSecurity) +extend_target("tst_qmdiarea" CONDITION APPLE_OSX LIBRARIES ${FWSecurity}) diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt index 84878c7ec8..3fb1c5ccb1 100644 --- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt @@ -2,5 +2,5 @@ add_qt_test("tst_qmenubar" RUN_SERIAL SOURCES tst_qmenubar.cpp LIBRARIES Qt::Wid extend_target("tst_qmenubar" CONDITION APPLE_OSX SOURCES tst_qmenubar_mac.mm - LIBRARIES FWAppKit + LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt index d05e0aa8c6..f3a9a9ab90 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt @@ -4,4 +4,4 @@ add_qt_test("tst_qplaintextedit" RUN_SERIAL SOURCES tst_qplaintextedit.cpp Qt::GuiPrivate ) -extend_target("tst_qplaintextedit" CONDITION APPLE_OSX LIBRARIES FWAppKit) +extend_target("tst_qplaintextedit" CONDITION APPLE_OSX LIBRARIES ${FWAppKit}) -- cgit v1.2.3 From 90243aebb653f67a3898fff2f9feec9dca2ded5d Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Sun, 19 May 2019 13:33:27 +0200 Subject: QTextBrowser: set base URL and document URL before loading content setHtml() or setMarkdown() can result in attempting to load resources such as images that are needed to render the page. Whenever the resource has a relative URL, loading depends on the baseURL having already been set so that a complete URL can be constructed. QTextDocument::resource() is called to load images, and uses baseUrl(). A little later, QTextBrowserPrivate::resolveUrl() is given an URL that already has been extended with the baseURL if known; but it has its own logic to resolve the resource URL against currentURL, or else to treat it as a local file path if a file exists at that location. The autotest was relying on this fallback to the local relative file path before; but now it tests both with a local filename in the current directory for the source HTML and also with a fully resolved source URL containing the complete file path. Also made minor style improvements in tst_QTextBrowser's TestBrowser class. Change-Id: I46a850015d0e9c5bc5f13b9e37179a9323ab1980 Reviewed-by: Simon Hausmann --- .../widgets/qtextbrowser/tst_qtextbrowser.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp index 8a1b228c71..1f95032165 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp +++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -38,7 +38,7 @@ class TestBrowser : public QTextBrowser { public: - inline TestBrowser() : htmlLoadAttempts(0) { + inline TestBrowser() { show(); QApplication::setActiveWindow(this); activateWindow(); @@ -47,11 +47,12 @@ public: QVERIFY(hasFocus()); } - virtual QVariant loadResource(int type, const QUrl &name); + QVariant loadResource(int type, const QUrl &name) override; - int htmlLoadAttempts; + int htmlLoadAttempts = 0; QUrl lastResource; QUrl sourceInsideLoadResource; + QUrl baseInsideLoadResource; }; QVariant TestBrowser::loadResource(int type, const QUrl &name) @@ -60,6 +61,7 @@ QVariant TestBrowser::loadResource(int type, const QUrl &name) htmlLoadAttempts++; lastResource = name; sourceInsideLoadResource = source(); + baseInsideLoadResource = document()->baseUrl(); return QTextBrowser::loadResource(type, name); } @@ -108,7 +110,7 @@ void tst_QTextBrowser::init() void tst_QTextBrowser::cleanup() { delete browser; - browser = 0; + browser = nullptr; } void tst_QTextBrowser::noReloadOnAnchorJump() @@ -428,11 +430,18 @@ void tst_QTextBrowser::sourceInsideLoadResource() #ifdef Q_OS_WINRT QSKIP("Paths cannot be compared if applications are sandboxed."); #endif - QUrl url = QUrl::fromLocalFile("pagewithimage.html"); + QUrl url = QUrl::fromLocalFile("pagewithimage.html"); // "file://pagewithimage.html" browser->setSource(url); QCOMPARE(browser->lastResource, QUrl::fromLocalFile(QDir::current().filePath("foobar.png"))); + // baseUrl was not set because the source URL was a relative one + QCOMPARE(browser->baseInsideLoadResource, QUrl()); QEXPECT_FAIL("", "This is currently not supported", Continue); QCOMPARE(browser->sourceInsideLoadResource.toString(), url.toString()); + url = QUrl::fromLocalFile(QDir::current().filePath("pagewithimage.html")); // "file:///home/user/path/to/pagewithimage.html" + browser->setSource(url); + QCOMPARE(browser->lastResource, QUrl::fromLocalFile(QDir::current().filePath("foobar.png"))); + // baseUrl has the full path, and that's where relative-path resources come from + QCOMPARE(browser->baseInsideLoadResource, QUrl::fromLocalFile(QDir::currentPath() + QLatin1Char('/'))); } void tst_QTextBrowser::textInteractionFlags_vs_readOnly() -- cgit v1.2.3 From c9b7cc349a13b722ecd636ec4eb8e21f9f712add Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 23 May 2019 13:51:05 +0200 Subject: Remove usages of Q_OS_WINCE This platform is history. Change-Id: Iddfab008a509f4828c321730414c8204055cf7af Reviewed-by: Maurice Kalinowski --- tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index cb829c81a6..d6ba85d61f 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -113,10 +113,7 @@ private slots: void check_escKey(); #endif -#ifndef Q_OS_WINCE void allowActiveAndDisabled(); -#endif - void taskQTBUG56860_focus(); void check_endKey(); void check_homeKey(); -- cgit v1.2.3 From 96bdec394ccd47cd3bb5c74561bb9a6e26ec9bbb Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 24 Jul 2019 10:52:09 +0200 Subject: Regenerate qtextedit test It was not built previously on macOS due to private_tests feature misbehaving, and thus it now fails due to incorrect framework linkage. Regenerate it. Change-Id: I2f4338e3ef3bf160ae4f13083e8da5f8db47b9c0 Reviewed-by: Simon Hausmann --- .../auto/widgets/widgets/qtextedit/CMakeLists.txt | 32 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt index 1a8e79e055..276cabc8b4 100644 --- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt @@ -1,8 +1,32 @@ -add_qt_test("tst_qtextedit" RUN_SERIAL SOURCES tst_qtextedit.cpp +# Generated from qtextedit.pro. + +##################################################################### +## tst_qtextedit Test: +##################################################################### + +# Collect test data +list(APPEND test_data "fullWidthSelection") + +add_qt_test(tst_qtextedit + SOURCES + tst_qtextedit.cpp LIBRARIES - Qt::WidgetsPrivate - Qt::GuiPrivate Qt::CorePrivate + Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + TESTDATA ${test_data} ) -extend_target("tst_qtextedit" CONDITION APPLE_OSX LIBRARIES FWAppKit) +#### Keys ignored in scope 1:.:.:qtextedit.pro:: +# CONFIG = "testcase" + +## Scopes: +##################################################################### + +extend_target(tst_qtextedit CONDITION APPLE_OSX + PUBLIC_LIBRARIES + ${FWAppKit} +) -- cgit v1.2.3 From 52d9b2234cb54d00404607e986e90ca39a68e332 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 Nov 2019 17:43:30 +0100 Subject: Regenerate tests/auto/widgets/widgets Change-Id: I9d9360612931b29b5d13a224236ef650dc5c8e1d Reviewed-by: Simon Hausmann --- .../widgets/widgets/qabstractbutton/CMakeLists.txt | 14 +++++++++- .../widgets/qabstractscrollarea/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qabstractslider/CMakeLists.txt | 16 +++++++++++- .../widgets/qabstractspinbox/CMakeLists.txt | 16 +++++++++--- .../widgets/widgets/qbuttongroup/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qcalendarwidget/CMakeLists.txt | 14 +++++++++- .../auto/widgets/widgets/qcheckbox/CMakeLists.txt | 14 +++++++++- .../auto/widgets/widgets/qcombobox/CMakeLists.txt | 25 +++++++++++++++--- .../widgets/qcommandlinkbutton/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qdatetimeedit/CMakeLists.txt | 14 ++++++++-- tests/auto/widgets/widgets/qdial/CMakeLists.txt | 14 +++++++++- .../widgets/qdialogbuttonbox/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qdockwidget/CMakeLists.txt | 15 +++++++++-- .../widgets/widgets/qdoublespinbox/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qfocusframe/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qfontcombobox/CMakeLists.txt | 14 +++++++++- tests/auto/widgets/widgets/qframe/CMakeLists.txt | 21 ++++++++++++++- .../auto/widgets/widgets/qgroupbox/CMakeLists.txt | 14 +++++++++- .../widgets/qkeysequenceedit/CMakeLists.txt | 14 +++++++++- tests/auto/widgets/widgets/qlabel/CMakeLists.txt | 26 +++++++++++++++++-- .../auto/widgets/widgets/qlcdnumber/CMakeLists.txt | 14 +++++++++- .../auto/widgets/widgets/qlineedit/CMakeLists.txt | 25 +++++++++++++++--- .../widgets/widgets/qmainwindow/CMakeLists.txt | 16 +++++++++++- tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt | 30 +++++++++++++++++++--- .../widgets/widgets/qmdisubwindow/CMakeLists.txt | 17 ++++++++++-- tests/auto/widgets/widgets/qmenu/CMakeLists.txt | 30 +++++++++++++++++----- tests/auto/widgets/widgets/qmenubar/CMakeLists.txt | 27 ++++++++++++++++--- .../widgets/widgets/qopenglwidget/CMakeLists.txt | 14 ++++++++-- .../widgets/widgets/qplaintextedit/CMakeLists.txt | 25 +++++++++++++++--- .../widgets/widgets/qprogressbar/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qpushbutton/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qradiobutton/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qscrollarea/CMakeLists.txt | 14 +++++++++- .../auto/widgets/widgets/qscrollbar/CMakeLists.txt | 16 +++++++++++- .../auto/widgets/widgets/qsizegrip/CMakeLists.txt | 16 +++++++++++- tests/auto/widgets/widgets/qslider/CMakeLists.txt | 14 +++++++++- tests/auto/widgets/widgets/qspinbox/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qsplashscreen/CMakeLists.txt | 14 +++++++++- .../auto/widgets/widgets/qsplitter/CMakeLists.txt | 19 +++++++++++++- .../widgets/widgets/qstackedwidget/CMakeLists.txt | 14 +++++++++- .../auto/widgets/widgets/qstatusbar/CMakeLists.txt | 14 +++++++++- tests/auto/widgets/widgets/qtabbar/CMakeLists.txt | 14 +++++++++- .../auto/widgets/widgets/qtabwidget/CMakeLists.txt | 26 +++++++++++++++++-- .../widgets/widgets/qtextbrowser/CMakeLists.txt | 21 ++++++++++++--- .../auto/widgets/widgets/qtextedit/CMakeLists.txt | 3 --- tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt | 17 +++++++++++- tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt | 14 +++++++++- .../widgets/widgets/qtoolbutton/CMakeLists.txt | 14 +++++++++- 48 files changed, 719 insertions(+), 80 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt index 7b2123b530..ce1e55e519 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qabstractbutton" RUN_SERIAL SOURCES tst_qabstractbutton.cpp LIBRARIES Qt::Widgets) +# Generated from qabstractbutton.pro. + +##################################################################### +## tst_qabstractbutton Test: +##################################################################### + +add_qt_test(tst_qabstractbutton + SOURCES + tst_qabstractbutton.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt index a003346393..cb1b2aa936 100644 --- a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qabstractscrollarea" RUN_SERIAL SOURCES tst_qabstractscrollarea.cpp LIBRARIES Qt::Widgets) +# Generated from qabstractscrollarea.pro. + +##################################################################### +## tst_qabstractscrollarea Test: +##################################################################### + +add_qt_test(tst_qabstractscrollarea + SOURCES + tst_qabstractscrollarea.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt index 6974ae4172..275f80db95 100644 --- a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt @@ -1 +1,15 @@ -add_qt_test("tst_qabstractslider" RUN_SERIAL SOURCES tst_qabstractslider.cpp LIBRARIES Qt::Widgets Qt::TestPrivate) +# Generated from qabstractslider.pro. + +##################################################################### +## tst_qabstractslider Test: +##################################################################### + +add_qt_test(tst_qabstractslider + SOURCES + tst_qabstractslider.cpp + LIBRARIES + Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt index 88c69d370b..ecfe26fb5c 100644 --- a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt @@ -1,7 +1,17 @@ -add_qt_test("tst_qabstractspinbox" RUN_SERIAL SOURCES tst_qabstractspinbox.cpp +# Generated from qabstractspinbox.pro. + +##################################################################### +## tst_qabstractspinbox Test: +##################################################################### + +add_qt_test(tst_qabstractspinbox + SOURCES + tst_qabstractspinbox.cpp LIBRARIES - Qt::Widgets - Qt::GuiPrivate Qt::CorePrivate + Qt::GuiPrivate Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt index 37b2196705..92d04e0c26 100644 --- a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qbuttongroup" RUN_SERIAL SOURCES tst_qbuttongroup.cpp LIBRARIES Qt::Widgets) +# Generated from qbuttongroup.pro. + +##################################################################### +## tst_qbuttongroup Test: +##################################################################### + +add_qt_test(tst_qbuttongroup + SOURCES + tst_qbuttongroup.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt index 4aad3abff9..10e24a1016 100644 --- a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qcalendarwidget" RUN_SERIAL SOURCES tst_qcalendarwidget.cpp LIBRARIES Qt::Widgets) +# Generated from qcalendarwidget.pro. + +##################################################################### +## tst_qcalendarwidget Test: +##################################################################### + +add_qt_test(tst_qcalendarwidget + SOURCES + tst_qcalendarwidget.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt index 2640889d94..2418791e5d 100644 --- a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qcheckbox" RUN_SERIAL SOURCES tst_qcheckbox.cpp LIBRARIES Qt::Widgets) +# Generated from qcheckbox.pro. + +##################################################################### +## tst_qcheckbox Test: +##################################################################### + +add_qt_test(tst_qcheckbox + SOURCES + tst_qcheckbox.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt index 8697a67820..ba12840211 100644 --- a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt @@ -1,8 +1,25 @@ -add_qt_test("tst_qcombobox" RUN_SERIAL SOURCES tst_qcombobox.cpp - DEFINES QTEST_QPA_MOUSE_HANDLING +# Generated from qcombobox.pro. + +##################################################################### +## tst_qcombobox Test: +##################################################################### + +# Collect test data +list(APPEND test_data "qtlogo.png") +list(APPEND test_data "qtlogoinverted.png") + +add_qt_test(tst_qcombobox + SOURCES + tst_qcombobox.cpp + DEFINES + QTEST_QPA_MOUSE_HANDLING LIBRARIES - Qt::WidgetsPrivate - Qt::GuiPrivate Qt::CorePrivate + Qt::GuiPrivate Qt::TestPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + TESTDATA ${test_data} ) diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt index 2893e2d0f3..59ba375358 100644 --- a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qcommandlinkbutton" RUN_SERIAL SOURCES tst_qcommandlinkbutton.cpp LIBRARIES Qt::Widgets) +# Generated from qcommandlinkbutton.pro. + +##################################################################### +## tst_qcommandlinkbutton Test: +##################################################################### + +add_qt_test(tst_qcommandlinkbutton + SOURCES + tst_qcommandlinkbutton.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt index 1f977399ac..9d9f641f92 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt @@ -1,6 +1,16 @@ -add_qt_test("tst_qdatetimeedit" RUN_SERIAL SOURCES tst_qdatetimeedit.cpp +# Generated from qdatetimeedit.pro. + +##################################################################### +## tst_qdatetimeedit Test: +##################################################################### + +add_qt_test(tst_qdatetimeedit + SOURCES + tst_qdatetimeedit.cpp LIBRARIES - Qt::Widgets Qt::CorePrivate Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qdial/CMakeLists.txt b/tests/auto/widgets/widgets/qdial/CMakeLists.txt index 76fc75d85a..e725edacb6 100644 --- a/tests/auto/widgets/widgets/qdial/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdial/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qdial" RUN_SERIAL SOURCES tst_qdial.cpp LIBRARIES Qt::Widgets) +# Generated from qdial.pro. + +##################################################################### +## tst_qdial Test: +##################################################################### + +add_qt_test(tst_qdial + SOURCES + tst_qdial.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt index 032189307c..c4961f13a1 100644 --- a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qdialogbuttonbox" RUN_SERIAL SOURCES tst_qdialogbuttonbox.cpp LIBRARIES Qt::Widgets) +# Generated from qdialogbuttonbox.pro. + +##################################################################### +## tst_qdialogbuttonbox Test: +##################################################################### + +add_qt_test(tst_qdialogbuttonbox + SOURCES + tst_qdialogbuttonbox.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt index 4bbe5234d9..415498c649 100644 --- a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt @@ -1,6 +1,17 @@ -add_qt_test("tst_qdockwidget" RUN_SERIAL SOURCES tst_qdockwidget.cpp +# Generated from qdockwidget.pro. + +##################################################################### +## tst_qdockwidget Test: +##################################################################### + +add_qt_test(tst_qdockwidget + SOURCES + tst_qdockwidget.cpp LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt index 8030b82b42..b639289db8 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qdoublespinbox" RUN_SERIAL SOURCES tst_qdoublespinbox.cpp LIBRARIES Qt::Widgets) +# Generated from qdoublespinbox.pro. + +##################################################################### +## tst_qdoublespinbox Test: +##################################################################### + +add_qt_test(tst_qdoublespinbox + SOURCES + tst_qdoublespinbox.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt index 1aac33f254..85160faed7 100644 --- a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qfocusframe" RUN_SERIAL SOURCES tst_qfocusframe.cpp LIBRARIES Qt::Widgets) +# Generated from qfocusframe.pro. + +##################################################################### +## tst_qfocusframe Test: +##################################################################### + +add_qt_test(tst_qfocusframe + SOURCES + tst_qfocusframe.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt index 6bb659cca2..777abc48c5 100644 --- a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qfontcombobox" RUN_SERIAL SOURCES tst_qfontcombobox.cpp LIBRARIES Qt::Widgets) +# Generated from qfontcombobox.pro. + +##################################################################### +## tst_qfontcombobox Test: +##################################################################### + +add_qt_test(tst_qfontcombobox + SOURCES + tst_qfontcombobox.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt index f109c76d0d..ae23555fa5 100644 --- a/tests/auto/widgets/widgets/qframe/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt @@ -1 +1,20 @@ -add_qt_test("tst_qframe" RUN_SERIAL SOURCES tst_qframe.cpp LIBRARIES Qt::Widgets) +# 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}) + +add_qt_test(tst_qframe + SOURCES + tst_qframe.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + TESTDATA ${test_data} +) diff --git a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt index 5885420d31..09d4623cd9 100644 --- a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qgroupbox" RUN_SERIAL SOURCES tst_qgroupbox.cpp LIBRARIES Qt::Widgets) +# Generated from qgroupbox.pro. + +##################################################################### +## tst_qgroupbox Test: +##################################################################### + +add_qt_test(tst_qgroupbox + SOURCES + tst_qgroupbox.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt index 415b49dd1b..c57f8b5c0a 100644 --- a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qkeysequenceedit" RUN_SERIAL SOURCES tst_qkeysequenceedit.cpp LIBRARIES Qt::Widgets) +# Generated from qkeysequenceedit.pro. + +##################################################################### +## tst_qkeysequenceedit Test: +##################################################################### + +add_qt_test(tst_qkeysequenceedit + SOURCES + tst_qkeysequenceedit.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt index 91ce86552a..3d6d055fed 100644 --- a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt @@ -1,6 +1,28 @@ -add_qt_test("tst_qlabel" RUN_SERIAL SOURCES tst_qlabel.cpp +# Generated from qlabel.pro. + +##################################################################### +## tst_qlabel Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + testdata/*) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.png) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qlabel + SOURCES + tst_qlabel.cpp LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + TESTDATA ${test_data} ) diff --git a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt index 4f748f0ae8..fbd9ff5913 100644 --- a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qlcdnumber" RUN_SERIAL SOURCES tst_qlcdnumber.cpp LIBRARIES Qt::Widgets) +# Generated from qlcdnumber.pro. + +##################################################################### +## tst_qlcdnumber Test: +##################################################################### + +add_qt_test(tst_qlcdnumber + SOURCES + tst_qlcdnumber.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt index 00e0c1d575..6e9d80ee66 100644 --- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt @@ -1,9 +1,26 @@ -add_qt_test("tst_qlineedit" RUN_SERIAL SOURCES tst_qlineedit.cpp +# Generated from qlineedit.pro. + +##################################################################### +## tst_qlineedit Test: +##################################################################### + +add_qt_test(tst_qlineedit + SOURCES + tst_qlineedit.cpp LIBRARIES - Qt::GuiPrivate Qt::CorePrivate - Qt::WidgetsPrivate + Qt::GuiPrivate Qt::TestPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) -extend_target("tst_qlineedit" CONDITION APPLE_OSX LIBRARIES ${FWAppKit}) +## Scopes: +##################################################################### + +extend_target(tst_qlineedit CONDITION APPLE_OSX + PUBLIC_LIBRARIES + ${FWAppKit} +) diff --git a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt index f1756bd342..292ab5aeb1 100644 --- a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt @@ -1 +1,15 @@ -add_qt_test("tst_qmainwindow" RUN_SERIAL SOURCES tst_qmainwindow.cpp LIBRARIES Qt::WidgetsPrivate) +# Generated from qmainwindow.pro. + +##################################################################### +## tst_qmainwindow Test: +##################################################################### + +add_qt_test(tst_qmainwindow + SOURCES + tst_qmainwindow.cpp + LIBRARIES + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt index 0f32c0ebce..d796baf93d 100644 --- a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt @@ -1,11 +1,33 @@ -add_qt_test("tst_qmdiarea" RUN_SERIAL SOURCES tst_qmdiarea.cpp +# Generated from qmdiarea.pro. + +##################################################################### +## tst_qmdiarea Test: +##################################################################### + +add_qt_test(tst_qmdiarea + SOURCES + tst_qmdiarea.cpp DEFINES - QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + INCLUDE_DIRECTORIES + . LIBRARIES Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui Qt::Widgets ) -extend_target("tst_qmdiarea" CONDITION TARGET Qt::OpenGL LIBRARIES Qt::OpenGL) -extend_target("tst_qmdiarea" CONDITION APPLE_OSX LIBRARIES ${FWSecurity}) +## Scopes: +##################################################################### + +extend_target(tst_qmdiarea CONDITION TARGET Qt::OpenGL + PUBLIC_LIBRARIES + Qt::OpenGL +) + +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 c095ccebd0..9844b9192f 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt @@ -1,7 +1,20 @@ -add_qt_test("tst_qmdisubwindow" RUN_SERIAL SOURCES tst_qmdisubwindow.cpp +# Generated from qmdisubwindow.pro. + +##################################################################### +## tst_qmdisubwindow Test: +##################################################################### + +add_qt_test(tst_qmdisubwindow + SOURCES + tst_qmdisubwindow.cpp DEFINES - QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + INCLUDE_DIRECTORIES + . LIBRARIES Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt index 6e9da6d474..4c1863d9ef 100644 --- a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt @@ -1,13 +1,31 @@ -add_qt_test("tst_qmenu" RUN_SERIAL SOURCES tst_qmenu.cpp +# Generated from qmenu.pro. + +##################################################################### +## tst_qmenu Test: +##################################################################### + +add_qt_test(tst_qmenu + SOURCES + tst_qmenu.cpp LIBRARIES Qt::GuiPrivate - Qt::Widgets Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) -extend_target("tst_qmenu" CONDITION APPLE_OSX - SOURCES tst_qmenu_mac.mm - LIBRARIES -lobjc +## Scopes: +##################################################################### + +extend_target(tst_qmenu CONDITION APPLE_OSX + SOURCES + tst_qmenu_mac.mm + PUBLIC_LIBRARIES + objc ) -extend_target("tst_qmenu" CONDITION NOT APPLEL_OSX DEFINES QTEST_QPA_MOUSE_HANDLING) +extend_target(tst_qmenu CONDITION NOT APPLE_OSX + DEFINES + QTEST_QPA_MOUSE_HANDLING +) diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt index 3fb1c5ccb1..cc1ce337ea 100644 --- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt @@ -1,6 +1,25 @@ -add_qt_test("tst_qmenubar" RUN_SERIAL SOURCES tst_qmenubar.cpp LIBRARIES Qt::Widgets Qt::TestPrivate) +# Generated from qmenubar.pro. -extend_target("tst_qmenubar" CONDITION APPLE_OSX - SOURCES tst_qmenubar_mac.mm - LIBRARIES ${FWAppKit} +##################################################################### +## tst_qmenubar Test: +##################################################################### + +add_qt_test(tst_qmenubar + SOURCES + tst_qmenubar.cpp + LIBRARIES + Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +## Scopes: +##################################################################### + +extend_target(tst_qmenubar CONDITION APPLE_OSX + SOURCES + tst_qmenubar_mac.mm + PUBLIC_LIBRARIES + ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index a9172dec4f..01f44ef78e 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -1,6 +1,16 @@ -add_qt_test("tst_qopenglwidget" RUN_SERIAL SOURCES tst_qopenglwidget.cpp +# Generated from qopenglwidget.pro. + +##################################################################### +## tst_qopenglwidget Test: +##################################################################### + +add_qt_test(tst_qopenglwidget + SOURCES + tst_qopenglwidget.cpp LIBRARIES - Qt::GuiPrivate Qt::CorePrivate + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt index f3a9a9ab90..0774967c8c 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt @@ -1,7 +1,26 @@ -add_qt_test("tst_qplaintextedit" RUN_SERIAL SOURCES tst_qplaintextedit.cpp +# Generated from qplaintextedit.pro. + +##################################################################### +## tst_qplaintextedit Test: +##################################################################### + +add_qt_test(tst_qplaintextedit + SOURCES + tst_qplaintextedit.cpp + INCLUDE_DIRECTORIES + .. LIBRARIES - Qt::WidgetsPrivate Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) -extend_target("tst_qplaintextedit" CONDITION APPLE_OSX LIBRARIES ${FWAppKit}) +## Scopes: +##################################################################### + +extend_target(tst_qplaintextedit CONDITION APPLE_OSX + PUBLIC_LIBRARIES + ${FWAppKit} +) diff --git a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt index 5fb9e79056..f8b3ac38d9 100644 --- a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qprogressbar" RUN_SERIAL SOURCES tst_qprogressbar.cpp LIBRARIES Qt::Widgets) +# Generated from qprogressbar.pro. + +##################################################################### +## tst_qprogressbar Test: +##################################################################### + +add_qt_test(tst_qprogressbar + SOURCES + tst_qprogressbar.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt index 7b78b96844..8d1300de79 100644 --- a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qpushbutton" RUN_SERIAL SOURCES tst_qpushbutton.cpp LIBRARIES Qt::Widgets) +# Generated from qpushbutton.pro. + +##################################################################### +## tst_qpushbutton Test: +##################################################################### + +add_qt_test(tst_qpushbutton + SOURCES + tst_qpushbutton.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt index 08322899a2..10db8a2db8 100644 --- a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qradiobutton" RUN_SERIAL SOURCES tst_qradiobutton.cpp LIBRARIES Qt::Widgets) +# Generated from qradiobutton.pro. + +##################################################################### +## tst_qradiobutton Test: +##################################################################### + +add_qt_test(tst_qradiobutton + SOURCES + tst_qradiobutton.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt index b21a9755d4..cdfb32e0a2 100644 --- a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qscrollarea" RUN_SERIAL SOURCES tst_qscrollarea.cpp LIBRARIES Qt::Widgets) +# Generated from qscrollarea.pro. + +##################################################################### +## tst_qscrollarea Test: +##################################################################### + +add_qt_test(tst_qscrollarea + SOURCES + tst_qscrollarea.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt index 88163f38c3..92b8049ef6 100644 --- a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt @@ -1 +1,15 @@ -add_qt_test("tst_qscrollbar" RUN_SERIAL SOURCES tst_qscrollbar.cpp LIBRARIES Qt::Widgets Qt::TestPrivate) +# Generated from qscrollbar.pro. + +##################################################################### +## tst_qscrollbar Test: +##################################################################### + +add_qt_test(tst_qscrollbar + SOURCES + tst_qscrollbar.cpp + LIBRARIES + Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt index f3f6548774..d3b28797f2 100644 --- a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt @@ -1 +1,15 @@ -add_qt_test("tst_qsizegrip" RUN_SERIAL SOURCES tst_qsizegrip.cpp LIBRARIES Qt::Widgets) +# Generated from qsizegrip.pro. + +##################################################################### +## tst_qsizegrip Test: +##################################################################### + +add_qt_test(tst_qsizegrip + SOURCES + tst_qsizegrip.cpp + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qslider/CMakeLists.txt b/tests/auto/widgets/widgets/qslider/CMakeLists.txt index 1da3dc0d0a..583f12a1fb 100644 --- a/tests/auto/widgets/widgets/qslider/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qslider/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qslider" RUN_SERIAL SOURCES tst_qslider.cpp LIBRARIES Qt::Widgets) +# Generated from qslider.pro. + +##################################################################### +## tst_qslider Test: +##################################################################### + +add_qt_test(tst_qslider + SOURCES + tst_qslider.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt index 80f1de0702..826de28cb4 100644 --- a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qspinbox" RUN_SERIAL SOURCES tst_qspinbox.cpp LIBRARIES Qt::Widgets) +# Generated from qspinbox.pro. + +##################################################################### +## tst_qspinbox Test: +##################################################################### + +add_qt_test(tst_qspinbox + SOURCES + tst_qspinbox.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt index 028d8fc82e..babe84f43e 100644 --- a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qsplashscreen" RUN_SERIAL SOURCES tst_qsplashscreen.cpp LIBRARIES Qt::Widgets) +# Generated from qsplashscreen.pro. + +##################################################################### +## tst_qsplashscreen Test: +##################################################################### + +add_qt_test(tst_qsplashscreen + SOURCES + tst_qsplashscreen.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt index a0dfd3a9c5..98c165f034 100644 --- a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt @@ -1 +1,18 @@ -add_qt_test("tst_qsplitter" RUN_SERIAL SOURCES tst_qsplitter.cpp LIBRARIES Qt::Widgets) +# Generated from qsplitter.pro. + +##################################################################### +## tst_qsplitter Test: +##################################################################### + +# Collect test data +list(APPEND test_data "extradata.txt") +list(APPEND test_data "setSizes3.dat") + +add_qt_test(tst_qsplitter + SOURCES + tst_qsplitter.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + TESTDATA ${test_data} +) diff --git a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt index 8b2b79b181..37807eb73a 100644 --- a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qstackedwidget" RUN_SERIAL SOURCES tst_qstackedwidget.cpp LIBRARIES Qt::Widgets) +# Generated from qstackedwidget.pro. + +##################################################################### +## tst_qstackedwidget Test: +##################################################################### + +add_qt_test(tst_qstackedwidget + SOURCES + tst_qstackedwidget.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt index ba65925b6e..56f3c960fd 100644 --- a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qstatusbar" RUN_SERIAL SOURCES tst_qstatusbar.cpp LIBRARIES Qt::Widgets) +# Generated from qstatusbar.pro. + +##################################################################### +## tst_qstatusbar Test: +##################################################################### + +add_qt_test(tst_qstatusbar + SOURCES + tst_qstatusbar.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt index 003d4a778b..d23d23d88f 100644 --- a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qtabbar" RUN_SERIAL SOURCES tst_qtabbar.cpp LIBRARIES Qt::Widgets) +# Generated from qtabbar.pro. + +##################################################################### +## tst_qtabbar Test: +##################################################################### + +add_qt_test(tst_qtabbar + SOURCES + tst_qtabbar.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt index 440603fac4..5cf53d1be5 100644 --- a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt @@ -1,3 +1,25 @@ -add_qt_test("tst_qtabwidget" RUN_SERIAL SOURCES tst_qtabwidget.cpp LIBRARIES Qt::WidgetsPrivate) +# Generated from qtabwidget.pro. -extend_target("tst_qtabwidget" CONDITION WIN32 AND NOT WINRT LIBRARIES -luser32) +##################################################################### +## tst_qtabwidget Test: +##################################################################### + +add_qt_test(tst_qtabwidget + SOURCES + tst_qtabwidget.cpp + INCLUDE_DIRECTORIES + .. + LIBRARIES + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +## Scopes: +##################################################################### + +extend_target(tst_qtabwidget CONDITION WIN32 AND NOT WINRT + PUBLIC_LIBRARIES + user32 +) diff --git a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt index 17742cf036..503dc32a83 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt @@ -4,17 +4,30 @@ ## tst_qtextbrowser Test: ##################################################################### +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.html) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.md) +list(APPEND test_data ${test_data_glob}) +list(APPEND test_data "markdown.really") +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + subdir/*) +list(APPEND test_data ${test_data_glob}) + add_qt_test(tst_qtextbrowser SOURCES tst_qtextbrowser.cpp PUBLIC_LIBRARIES + Qt::Gui Qt::Widgets + TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qtextbrowser.pro:: -# CONFIG = "testcase" -# TESTDATA = "*.html" "*.md" "subdir/*" - ## Scopes: ##################################################################### diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt index 276cabc8b4..db077d6354 100644 --- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt @@ -20,9 +20,6 @@ add_qt_test(tst_qtextedit TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qtextedit.pro:: -# CONFIG = "testcase" - ## Scopes: ##################################################################### diff --git a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt index ab6d4d082a..43803ccdff 100644 --- a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt @@ -1 +1,16 @@ -add_qt_test("tst_qtoolbar" RUN_SERIAL SOURCES tst_qtoolbar.cpp LIBRARIES Qt::WidgetsPrivate Qt::GuiPrivate) +# Generated from qtoolbar.pro. + +##################################################################### +## tst_qtoolbar Test: +##################################################################### + +add_qt_test(tst_qtoolbar + SOURCES + tst_qtoolbar.cpp + LIBRARIES + Qt::GuiPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt index 337f187878..dc3e5d016c 100644 --- a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qtoolbox" RUN_SERIAL SOURCES tst_qtoolbox.cpp LIBRARIES Qt::Widgets) +# Generated from qtoolbox.pro. + +##################################################################### +## tst_qtoolbox Test: +##################################################################### + +add_qt_test(tst_qtoolbox + SOURCES + tst_qtoolbox.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt index a253255617..ae36488341 100644 --- a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test("tst_qtoolbutton" RUN_SERIAL SOURCES tst_qtoolbutton.cpp LIBRARIES Qt::Widgets) +# Generated from qtoolbutton.pro. + +##################################################################### +## tst_qtoolbutton Test: +##################################################################### + +add_qt_test(tst_qtoolbutton + SOURCES + tst_qtoolbutton.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) -- cgit v1.2.3 From 1c655fb0fc08e89ab5efb23889266b710334f1a5 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Wed, 20 Nov 2019 09:25:19 +0100 Subject: Post merge fixes Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581 Reviewed-by: Alexandru Croitor --- tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt index ce1e55e519..c00064446b 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt @@ -7,6 +7,8 @@ add_qt_test(tst_qabstractbutton SOURCES tst_qabstractbutton.cpp + LIBRARIES + Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Widgets -- cgit v1.2.3 From 48c82e90af12da74c713665ddfd7f8d825ae5bdb Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 16 Jan 2020 10:42:05 +0100 Subject: Post Merge Fixes Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce Reviewed-by: Alexandru Croitor --- tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 01f44ef78e..37088f8495 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -12,5 +12,6 @@ add_qt_test(tst_qopenglwidget Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::OpenGL Qt::Widgets ) -- cgit v1.2.3 From 43d2b60a29df5397be4b4bead90f40346bf85dce Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 27 Jan 2020 13:25:34 +0100 Subject: Post-merge fixes Change-Id: I6acd29103f6cc550544e7422328d97ea0e2dcafb Reviewed-by: Simon Hausmann --- tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 37088f8495..1f5bb2dff8 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -10,6 +10,7 @@ add_qt_test(tst_qopenglwidget LIBRARIES Qt::CorePrivate Qt::GuiPrivate + Qt::OpenGLPrivate PUBLIC_LIBRARIES Qt::Gui Qt::OpenGL -- cgit v1.2.3