From 0d177053b9406e2fb21802d23f2b2cdc0f974377 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 12 Feb 2020 10:24:49 +0100 Subject: Regenerate projects one last time before merge Change-Id: Ia24cf56b79ca6dacd370a7e397024e9b663e0167 Reviewed-by: Liang Qi Reviewed-by: Simon Hausmann --- tests/auto/widgets/dialogs/qdialog/CMakeLists.txt | 5 ++--- tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt | 7 +++---- tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt | 7 +++---- tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt | 5 ++--- tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt | 7 +++---- tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt | 4 +--- tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt | 5 ++--- tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt | 5 ++--- tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt | 7 +++---- tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt | 5 ++--- .../auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt | 7 +++---- .../widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt | 7 +++---- .../auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt | 7 +++---- tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt | 7 +++---- tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt | 3 +-- .../auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt | 7 +++---- tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt | 7 +++---- tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt | 7 +++---- tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt | 7 +++---- tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt | 7 +++---- tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt | 5 ++--- tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt | 7 +++---- tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt | 7 +++---- tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt | 3 +-- tests/auto/widgets/itemviews/qlistview/CMakeLists.txt | 7 +++---- tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt | 7 +++---- tests/auto/widgets/itemviews/qtableview/CMakeLists.txt | 7 +++---- tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt | 7 +++---- tests/auto/widgets/kernel/qaction/CMakeLists.txt | 5 ++--- tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt | 7 +++---- tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt | 7 +++---- tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt | 3 +-- tests/auto/widgets/kernel/qformlayout/CMakeLists.txt | 5 ++--- tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt | 5 ++--- tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt | 7 +++---- tests/auto/widgets/kernel/qlayout/CMakeLists.txt | 5 ++--- tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt | 3 +-- tests/auto/widgets/kernel/qwidget/CMakeLists.txt | 7 +++---- tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt | 5 ++--- tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt | 3 +-- tests/auto/widgets/styles/qmacstyle/CMakeLists.txt | 4 +--- tests/auto/widgets/styles/qstyle/CMakeLists.txt | 3 +-- tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt | 7 +++---- tests/auto/widgets/util/qcompleter/CMakeLists.txt | 3 +-- tests/auto/widgets/util/qscroller/CMakeLists.txt | 3 +-- tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt | 3 +-- tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt | 3 +-- tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt | 5 ++--- tests/auto/widgets/widgets/qcombobox/CMakeLists.txt | 7 +++---- tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt | 5 ++--- tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt | 7 +++---- tests/auto/widgets/widgets/qlabel/CMakeLists.txt | 7 +++---- tests/auto/widgets/widgets/qlineedit/CMakeLists.txt | 7 +++---- tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt | 3 +-- tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt | 3 +-- tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt | 3 +-- tests/auto/widgets/widgets/qmenu/CMakeLists.txt | 5 ++--- tests/auto/widgets/widgets/qmenubar/CMakeLists.txt | 3 +-- tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt | 7 +++---- tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt | 5 ++--- tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt | 3 +-- tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt | 3 +-- tests/auto/widgets/widgets/qtextedit/CMakeLists.txt | 7 +++---- tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt | 5 ++--- 64 files changed, 140 insertions(+), 206 deletions(-) (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt index 13201d2384..2c003f6fb6 100644 --- a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qdialog SOURCES tst_qdialog.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt index 745e65b332..7b6d004776 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt @@ -9,11 +9,10 @@ add_qt_test(tst_qfiledialog tst_qfiledialog.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt index 4989c312c9..2fb610a784 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt @@ -9,11 +9,10 @@ add_qt_test(tst_qfiledialog2 tst_qfiledialog2.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt index c4baa3fc12..38c0547390 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt @@ -10,12 +10,11 @@ add_qt_test(tst_qfilesystemmodel tst_qfilesystemmodel.cpp INCLUDE_DIRECTORIES ../../../../shared - LIBRARIES - Qt::CorePrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) ## Scopes: diff --git a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt index 345822ac79..af858c8946 100644 --- a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt @@ -7,13 +7,12 @@ add_qt_test(tst_qfontdialog SOURCES tst_qfontdialog.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) # Resources: diff --git a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt index b9d9ef04a1..7cd02a04c0 100644 --- a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt @@ -7,9 +7,7 @@ add_qt_test(tst_qinputdialog SOURCES tst_qinputdialog.cpp - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt index 882cc143e1..ae12c58ca2 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qmessagebox SOURCES tst_qmessagebox.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt index bc7d9f26ed..d1e2a6686c 100644 --- a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qsidebar SOURCES tst_qsidebar.cpp - LIBRARIES - Qt::CorePrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt index b6cd4fa934..4cdeb6b4e5 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt +++ b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qgraphicseffect SOURCES tst_qgraphicseffect.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt index 31dbe56907..6ffd2c4029 100644 --- a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt +++ b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qpixmapfilter SOURCES tst_qpixmapfilter.cpp - LIBRARIES - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt index 6c213bc209..db323fcb15 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qgraphicsanchorlayout SOURCES tst_qgraphicsanchorlayout.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt index a6739093b4..9d9fc68832 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qgraphicsanchorlayout1 SOURCES tst_qgraphicsanchorlayout1.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt index 6becd124bf..ac1ac91f8b 100644 --- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qgraphicseffectsource SOURCES tst_qgraphicseffectsource.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt index b500ec487a..1be66372b6 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt @@ -9,14 +9,13 @@ add_qt_test(tst_qgraphicsitem tst_qgraphicsitem.cpp DEFINES QT_NO_CAST_TO_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) ## Scopes: diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt index 6fd8273708..0e29191792 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qgraphicsobject SOURCES tst_qgraphicsobject.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Widgets ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt index 77af1c5a83..accec5ff40 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt @@ -9,11 +9,10 @@ add_qt_test(tst_qgraphicsproxywidget tst_qgraphicsproxywidget.cpp DEFINES QTEST_QPA_MOUSE_HANDLING - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt index ddc377799f..c566b6c1bf 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt @@ -10,13 +10,12 @@ add_qt_test(tst_qgraphicsscene DEFINES QT_NO_CAST_TO_ASCII SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) # Resources: diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt index b8a5fcd905..5fa72f7b46 100644 --- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt @@ -11,13 +11,12 @@ endif() add_qt_test(tst_qgraphicssceneindex SOURCES tst_qgraphicssceneindex.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) #### Keys ignored in scope 1:.:.:qgraphicssceneindex.pro:: diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt index 191cc9a9c0..17c9571d62 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt @@ -10,14 +10,13 @@ add_qt_test(tst_qgraphicsview tst_qgraphicsview_2.cpp DEFINES QT_NO_CAST_TO_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) #### Keys ignored in scope 1:.:.:qgraphicsview.pro:: diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt index 9c49a957c0..7325f7eb21 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qgraphicswidget SOURCES tst_qgraphicswidget.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt index 02c52ed42d..520a0b4b98 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qabstractitemview SOURCES tst_qabstractitemview.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate + Qt::TestPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt index 47e6a1ee35..d33e3b9c2e 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt @@ -8,12 +8,11 @@ add_qt_test(tst_qcolumnview SOURCES ../../../../shared/fakedirmodel.h tst_qcolumnview.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt index 8a4cebe7d5..8949ac4957 100644 --- a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt @@ -9,11 +9,10 @@ add_qt_test(tst_qheaderview tst_qheaderview.cpp DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt index f97940b28a..af1bac9ff0 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qitemdelegate SOURCES tst_qitemdelegate.cpp - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) ## Scopes: diff --git a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt index 1c7c5ae7fe..07c290128e 100644 --- a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt @@ -7,14 +7,13 @@ add_qt_test(tst_qlistview SOURCES tst_qlistview.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) ## Scopes: diff --git a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt index 853b463893..aebcb4c49e 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qlistwidget SOURCES tst_qlistwidget.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt index 0906f4c5a1..20e50d2de3 100644 --- a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt @@ -7,12 +7,11 @@ add_qt_test(tst_qtableview SOURCES tst_qtableview.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt index 4914f705ab..40a6a1a6d6 100644 --- a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt @@ -8,12 +8,11 @@ add_qt_test(tst_qtreeview SOURCES ../../../../shared/fakedirmodel.h tst_qtreeview.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/kernel/qaction/CMakeLists.txt b/tests/auto/widgets/kernel/qaction/CMakeLists.txt index 67f98382f1..469cc4d597 100644 --- a/tests/auto/widgets/kernel/qaction/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qaction/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qaction SOURCES tst_qaction.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt index af5138c756..40e612f0de 100644 --- a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt @@ -12,13 +12,12 @@ list(APPEND test_data "../modal") add_qt_test(test SOURCES ../tst_qapplication.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt index bc2ef1000f..171ee1b273 100644 --- a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt @@ -12,13 +12,12 @@ list(APPEND test_data "../modal") add_qt_test(tst_qapplication # special case SOURCES ../tst_qapplication.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate TESTDATA ${test_data} OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case ) diff --git a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt index dca063e2f0..901d20f1e3 100644 --- a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qboxlayout SOURCES tst_qboxlayout.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::TestPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt index 48e1431a35..f786f3331c 100644 --- a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qformlayout SOURCES tst_qformlayout.cpp - LIBRARIES - Qt::TestPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::TestPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt index 7041320dd0..61bf8d303a 100644 --- a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qgesturerecognizer SOURCES tst_qgesturerecognizer.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt index 86661e505a..79995454f7 100644 --- a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt @@ -8,14 +8,13 @@ add_qt_test(tst_qgridlayout SOURCES sortdialog.ui tst_qgridlayout.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ENABLE_AUTOGEN_TOOLS uic ) diff --git a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt index 2a3526722e..e63a80117f 100644 --- a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt @@ -13,12 +13,11 @@ 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::TestPrivate Qt::Widgets + Qt::WidgetsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt index 440421a3ea..582f0d582d 100644 --- a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qsizepolicy SOURCES tst_qsizepolicy.cpp - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) ## Scopes: diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt index df2056476b..849dfea52a 100644 --- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt @@ -7,14 +7,13 @@ add_qt_test(tst_qwidget SOURCES tst_qwidget.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) # Resources: diff --git a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt index c3fc672c17..201c271103 100644 --- a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qwidget_window SOURCES tst_qwidget_window.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui 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 887ecda4af..06a4156b57 100644 --- a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qwidgetaction SOURCES tst_qwidgetaction.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::TestPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt b/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt index 59d33b9589..44053dbe3d 100644 --- a/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt +++ b/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt @@ -7,9 +7,7 @@ add_qt_test(tst_qmacstyle SOURCES tst_qmacstyle.cpp - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/styles/qstyle/CMakeLists.txt b/tests/auto/widgets/styles/qstyle/CMakeLists.txt index 1400c94633..21d81113f4 100644 --- a/tests/auto/widgets/styles/qstyle/CMakeLists.txt +++ b/tests/auto/widgets/styles/qstyle/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qstyle SOURCES tst_qstyle.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::TestPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt b/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt index ca1a2ee062..01c4df38fe 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt +++ b/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt @@ -11,13 +11,12 @@ endif() add_qt_test(tst_qstylesheetstyle SOURCES tst_qstylesheetstyle.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate + Qt::TestPrivate Qt::Widgets + Qt::WidgetsPrivate ) # Resources: diff --git a/tests/auto/widgets/util/qcompleter/CMakeLists.txt b/tests/auto/widgets/util/qcompleter/CMakeLists.txt index ffc47a8319..fb87c3beec 100644 --- a/tests/auto/widgets/util/qcompleter/CMakeLists.txt +++ b/tests/auto/widgets/util/qcompleter/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qcompleter SOURCES tst_qcompleter.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::TestPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/util/qscroller/CMakeLists.txt b/tests/auto/widgets/util/qscroller/CMakeLists.txt index 2a1e0dc427..b6c6efcc2f 100644 --- a/tests/auto/widgets/util/qscroller/CMakeLists.txt +++ b/tests/auto/widgets/util/qscroller/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qscroller SOURCES tst_qscroller.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt index c00064446b..48a174b6e1 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qabstractbutton SOURCES tst_qabstractbutton.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt index 275f80db95..0dbbf63239 100644 --- a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qabstractslider SOURCES tst_qabstractslider.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::TestPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt index ecfe26fb5c..32c814c535 100644 --- a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qabstractspinbox SOURCES tst_qabstractspinbox.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - 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 ba12840211..95fbe14eec 100644 --- a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt @@ -13,13 +13,12 @@ add_qt_test(tst_qcombobox tst_qcombobox.cpp DEFINES QTEST_QPA_MOUSE_HANDLING - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Widgets + Qt::WidgetsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt index 9d9f641f92..8eb294d361 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qdatetimeedit SOURCES tst_qdatetimeedit.cpp - LIBRARIES - Qt::CorePrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt index 415498c649..e2b6cc5942 100644 --- a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qdockwidget SOURCES tst_qdockwidget.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt index 3d6d055fed..a4fe508a02 100644 --- a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt @@ -17,12 +17,11 @@ list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qlabel SOURCES tst_qlabel.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt index 6e9d80ee66..f95094aa7d 100644 --- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt @@ -7,14 +7,13 @@ add_qt_test(tst_qlineedit SOURCES tst_qlineedit.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) ## Scopes: diff --git a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt index 292ab5aeb1..55bcf941d0 100644 --- a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qmainwindow SOURCES tst_qmainwindow.cpp - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt index d796baf93d..961bd09492 100644 --- a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt @@ -12,10 +12,9 @@ add_qt_test(tst_qmdiarea QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES . - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt index 9844b9192f..791d411970 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt @@ -12,9 +12,8 @@ add_qt_test(tst_qmdisubwindow QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES . - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt index 4c1863d9ef..a20fe70492 100644 --- a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qmenu SOURCES tst_qmenu.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate + Qt::TestPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt index cc1ce337ea..43875cd113 100644 --- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qmenubar SOURCES tst_qmenubar.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::TestPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 1f5bb2dff8..d9e447d38b 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -7,12 +7,11 @@ add_qt_test(tst_qopenglwidget SOURCES tst_qopenglwidget.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::OpenGLPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::OpenGL + Qt::OpenGLPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt index 0774967c8c..4106de04de 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt @@ -9,12 +9,11 @@ add_qt_test(tst_qplaintextedit tst_qplaintextedit.cpp INCLUDE_DIRECTORIES .. - LIBRARIES - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) ## Scopes: diff --git a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt index 92b8049ef6..83d091755f 100644 --- a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qscrollbar SOURCES tst_qscrollbar.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::TestPrivate Qt::Widgets ) diff --git a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt index 5cf53d1be5..9bd0018082 100644 --- a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt @@ -9,11 +9,10 @@ add_qt_test(tst_qtabwidget tst_qtabwidget.cpp INCLUDE_DIRECTORIES .. - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) ## Scopes: diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt index db077d6354..61641707b9 100644 --- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt @@ -10,13 +10,12 @@ list(APPEND test_data "fullWidthSelection") add_qt_test(tst_qtextedit SOURCES tst_qtextedit.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt index 43803ccdff..d3aef03fa1 100644 --- a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qtoolbar SOURCES tst_qtoolbar.cpp - LIBRARIES - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) -- cgit v1.2.3