summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-02-13 23:27:47 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-02-13 23:29:51 +0100
commitc53ee1f054fee2d6092c5e24b5b6b131dbd0457b (patch)
treeffdc87c81c72b545602c7380bbde3f0ab5c499e0 /tests/auto/widgets/widgets
parent60feaae1967aca5c7b1b0f6cb732962ddd1b2115 (diff)
parent0d177053b9406e2fb21802d23f2b2cdc0f974377 (diff)
Merge remote-tracking branch 'origin/wip/cmake' into dev
Conflicts: tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt Hopefully final merge from wip/cmake, and then all cmake changes should target dev directly. Change-Id: I29b04c9b0284e97334877c77a32ffdf887dbf95b
Diffstat (limited to 'tests/auto/widgets/widgets')
-rw-r--r--tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/widgets/qcombobox/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qlabel/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qlineedit/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qmenu/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/widgets/qmenubar/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qtextedit/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt5
19 files changed, 36 insertions, 55 deletions
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
)