diff options
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/lancelot/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/auto/other/languagechange/CMakeLists.txt | 5 | ||||
-rw-r--r-- | tests/auto/other/macgui/.prev_CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/other/macgui/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/other/networkselftest/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/auto/other/qaccessibility/.prev_CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/auto/other/qaccessibility/CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt | 9 | ||||
-rw-r--r-- | tests/auto/other/qaccessibilitylinux/CMakeLists.txt | 9 | ||||
-rw-r--r-- | tests/auto/other/qcomplextext/CMakeLists.txt | 5 | ||||
-rw-r--r-- | tests/auto/other/qfocusevent/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/auto/other/toolsupport/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/other/xkbkeyboard/CMakeLists.txt | 4 |
13 files changed, 23 insertions, 48 deletions
diff --git a/tests/auto/other/lancelot/CMakeLists.txt b/tests/auto/other/lancelot/CMakeLists.txt index f06586d3d4..6f15ff7990 100644 --- a/tests/auto/other/lancelot/CMakeLists.txt +++ b/tests/auto/other/lancelot/CMakeLists.txt @@ -21,10 +21,9 @@ add_qt_test(tst_lancelot QMAKESPEC=\\\"\\\" INCLUDE_DIRECTORIES ../../../baselineserver/shared - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Network TESTDATA ${test_data} ) diff --git a/tests/auto/other/languagechange/CMakeLists.txt b/tests/auto/other/languagechange/CMakeLists.txt index d93808848b..f5c43b0ed1 100644 --- a/tests/auto/other/languagechange/CMakeLists.txt +++ b/tests/auto/other/languagechange/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_languagechange SOURCES tst_languagechange.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt index 316d8f7232..4923568a89 100644 --- a/tests/auto/other/macgui/.prev_CMakeLists.txt +++ b/tests/auto/other/macgui/.prev_CMakeLists.txt @@ -15,11 +15,9 @@ add_qt_test(tst_macgui SOURCES guitest.cpp guitest.h tst_macgui.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Widgets ) #### Keys ignored in scope 1:.:.:macgui.pro:<TRUE>: diff --git a/tests/auto/other/macgui/CMakeLists.txt b/tests/auto/other/macgui/CMakeLists.txt index 898abf16f4..de69c43765 100644 --- a/tests/auto/other/macgui/CMakeLists.txt +++ b/tests/auto/other/macgui/CMakeLists.txt @@ -15,11 +15,9 @@ add_qt_test(tst_macgui SOURCES guitest.cpp guitest.h tst_macgui.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Widgets ) #### Keys ignored in scope 1:.:.:macgui.pro:<TRUE>: diff --git a/tests/auto/other/networkselftest/CMakeLists.txt b/tests/auto/other/networkselftest/CMakeLists.txt index 49a5664ded..7765557248 100644 --- a/tests/auto/other/networkselftest/CMakeLists.txt +++ b/tests/auto/other/networkselftest/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_networkselftest SOURCES tst_networkselftest.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network ) diff --git a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt index 85d938e100..8663e412c4 100644 --- a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt +++ b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt @@ -12,14 +12,12 @@ add_qt_test(tst_qaccessibility SOURCES accessiblewidgets.h tst_qaccessibility.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Widgets ) #### Keys ignored in scope 1:.:.:qaccessibility.pro:<TRUE>: @@ -42,8 +40,6 @@ extend_target(tst_qaccessibility CONDITION WIN32 ) extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT - LIBRARIES - Qt::WindowsUIAutomationSupportPrivate PUBLIC_LIBRARIES - Qt::WindowsUIAutomationSupport + Qt::WindowsUIAutomationSupportPrivate ) diff --git a/tests/auto/other/qaccessibility/CMakeLists.txt b/tests/auto/other/qaccessibility/CMakeLists.txt index 0b98cae5f9..f5f74bbafc 100644 --- a/tests/auto/other/qaccessibility/CMakeLists.txt +++ b/tests/auto/other/qaccessibility/CMakeLists.txt @@ -18,14 +18,12 @@ add_qt_test(tst_qaccessibility SOURCES accessiblewidgets.h tst_qaccessibility.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::TestPrivate Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Widgets ) #### Keys ignored in scope 1:.:.:qaccessibility.pro:<TRUE>: @@ -48,8 +46,6 @@ extend_target(tst_qaccessibility CONDITION WIN32 ) extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT - LIBRARIES - Qt::WindowsUIAutomationSupportPrivate PUBLIC_LIBRARIES - Qt::WindowsUIAutomationSupport + Qt::WindowsUIAutomationSupportPrivate ) diff --git a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt index adfb7e5a83..7111e9cf57 100644 --- a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt +++ b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt @@ -9,14 +9,11 @@ add_qt_test(tst_qaccessibilitylinux tst_qaccessibilitylinux.cpp DBUS_INTERFACE_SOURCES ../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml - LIBRARIES - Qt::AccessibilitySupportPrivate - Qt::GuiPrivate - Qt::LinuxAccessibilitySupportPrivate PUBLIC_LIBRARIES - Qt::AccessibilitySupport + Qt::AccessibilitySupportPrivate Qt::DBus Qt::Gui - Qt::LinuxAccessibilitySupport + Qt::GuiPrivate + Qt::LinuxAccessibilitySupportPrivate Qt::Widgets ) diff --git a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt index 905e68edc4..ae6e7c4205 100644 --- a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt +++ b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt @@ -15,15 +15,12 @@ add_qt_test(tst_qaccessibilitylinux tst_qaccessibilitylinux.cpp DBUS_INTERFACE_SOURCES ../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml - LIBRARIES - Qt::AccessibilitySupportPrivate - Qt::GuiPrivate - Qt::LinuxAccessibilitySupportPrivate PUBLIC_LIBRARIES - Qt::AccessibilitySupport + Qt::AccessibilitySupportPrivate Qt::DBus Qt::Gui - Qt::LinuxAccessibilitySupport + Qt::GuiPrivate + Qt::LinuxAccessibilitySupportPrivate Qt::Widgets ) diff --git a/tests/auto/other/qcomplextext/CMakeLists.txt b/tests/auto/other/qcomplextext/CMakeLists.txt index 883fabe01a..ee504faaf7 100644 --- a/tests/auto/other/qcomplextext/CMakeLists.txt +++ b/tests/auto/other/qcomplextext/CMakeLists.txt @@ -10,11 +10,10 @@ list(APPEND test_data "data") add_qt_test(tst_qcomplextext SOURCES tst_qcomplextext.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/other/qfocusevent/CMakeLists.txt b/tests/auto/other/qfocusevent/CMakeLists.txt index 044b176555..a2406c034a 100644 --- a/tests/auto/other/qfocusevent/CMakeLists.txt +++ b/tests/auto/other/qfocusevent/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qfocusevent SOURCES tst_qfocusevent.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/auto/other/toolsupport/CMakeLists.txt b/tests/auto/other/toolsupport/CMakeLists.txt index ee170b3a77..51af17d866 100644 --- a/tests/auto/other/toolsupport/CMakeLists.txt +++ b/tests/auto/other/toolsupport/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_toolsupport SOURCES tst_toolsupport.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/other/xkbkeyboard/CMakeLists.txt b/tests/auto/other/xkbkeyboard/CMakeLists.txt index fbbe5c67bb..93a02eea12 100644 --- a/tests/auto/other/xkbkeyboard/CMakeLists.txt +++ b/tests/auto/other/xkbkeyboard/CMakeLists.txt @@ -7,9 +7,7 @@ add_qt_test(tst_xkbkeyboard SOURCES tst_xkbkeyboard.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Gui ) |