diff options
| author | Alexandru Croitor <[email protected]> | 2020-02-12 10:24:49 +0100 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2020-02-12 17:30:49 +0000 |
| commit | 0d177053b9406e2fb21802d23f2b2cdc0f974377 (patch) | |
| tree | d6d805cb44995f88a455e12352064d9c075f0f3b | |
| parent | 36089f5e7793bd8b15e5b43caf18f856ff2a18b0 (diff) | |
Regenerate projects one last time before mergewip/cmake
Change-Id: Ia24cf56b79ca6dacd370a7e397024e9b663e0167
Reviewed-by: Liang Qi <[email protected]>
Reviewed-by: Simon Hausmann <[email protected]>
303 files changed, 482 insertions, 792 deletions
diff --git a/examples/opengl/hellowindow/CMakeLists.txt b/examples/opengl/hellowindow/CMakeLists.txt index 95f627be9dc..58bd3fc362c 100644 --- a/examples/opengl/hellowindow/CMakeLists.txt +++ b/examples/opengl/hellowindow/CMakeLists.txt @@ -18,14 +18,11 @@ add_qt_gui_executable(hellowindow hellowindow.cpp hellowindow.h main.cpp ) -target_link_libraries(hellowindow PRIVATE - Qt::CorePrivate - Qt::GuiPrivate -) - target_link_libraries(hellowindow PUBLIC Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) install(TARGETS hellowindow diff --git a/examples/qpa/windows/CMakeLists.txt b/examples/qpa/windows/CMakeLists.txt index 6f9bbe75343..4eeab0e3bc0 100644 --- a/examples/qpa/windows/CMakeLists.txt +++ b/examples/qpa/windows/CMakeLists.txt @@ -18,14 +18,11 @@ add_executable(windows main.cpp window.cpp window.h ) -target_link_libraries(windows PRIVATE - Qt::CorePrivate - Qt::GuiPrivate -) - target_link_libraries(windows PUBLIC Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) install(TARGETS windows diff --git a/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt b/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt index 93e3f43f9b1..183127519fa 100644 --- a/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt +++ b/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qpauseanimation SOURCES tst_qpauseanimation.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt index 1486256a94b..7e8eee14d37 100644 --- a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt +++ b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt @@ -10,6 +10,6 @@ add_qt_test(tst_qglobalstatic tst_qglobalstatic.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/global/qhooks/CMakeLists.txt b/tests/auto/corelib/global/qhooks/CMakeLists.txt index 01b3196bd1c..c86faba75fa 100644 --- a/tests/auto/corelib/global/qhooks/CMakeLists.txt +++ b/tests/auto/corelib/global/qhooks/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qhooks SOURCES tst_qhooks.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/global/qnumeric/CMakeLists.txt b/tests/auto/corelib/global/qnumeric/CMakeLists.txt index f96e038c3dc..8a857c56222 100644 --- a/tests/auto/corelib/global/qnumeric/CMakeLists.txt +++ b/tests/auto/corelib/global/qnumeric/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qnumeric SOURCES tst_qnumeric.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt index 23dd4407389..edd2efe7608 100644 --- a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt +++ b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qrandomgenerator SOURCES tst_qrandomgenerator.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/global/qtendian/CMakeLists.txt b/tests/auto/corelib/global/qtendian/CMakeLists.txt index 80b716f21fc..9efb17712ec 100644 --- a/tests/auto/corelib/global/qtendian/CMakeLists.txt +++ b/tests/auto/corelib/global/qtendian/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qtendian SOURCES tst_qtendian.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt index 1c1470cf517..1b7a11d6578 100644 --- a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt +++ b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qabstractfileengine SOURCES tst_qabstractfileengine.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qdataurl/CMakeLists.txt b/tests/auto/corelib/io/qdataurl/CMakeLists.txt index 84f1b5b11aa..507852a11ef 100644 --- a/tests/auto/corelib/io/qdataurl/CMakeLists.txt +++ b/tests/auto/corelib/io/qdataurl/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdataurl SOURCES tst_qdataurl.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt index 6ac1e5b46f1..84136283c10 100644 --- a/tests/auto/corelib/io/qdir/CMakeLists.txt +++ b/tests/auto/corelib/io/qdir/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND test_data "tst_qdir.cpp") add_qt_test(tst_qdir SOURCES tst_qdir.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt index dd10eb62c39..2e120b46211 100644 --- a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt +++ b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND test_data "entrylist") add_qt_test(tst_qdiriterator SOURCES tst_qdiriterator.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt index 03f2e99e374..a6cf3a38f11 100644 --- a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qfileinfo SOURCES tst_qfileinfo.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt index 3643ca6da4d..e989315bdd2 100644 --- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt @@ -8,6 +8,6 @@ add_qt_test(tst_qfilesystementry SOURCES ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h tst_qfilesystementry.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt index fc893146694..a237090a485 100644 --- a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qfilesystemmetadata SOURCES tst_qfilesystemmetadata.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qipaddress/CMakeLists.txt b/tests/auto/corelib/io/qipaddress/CMakeLists.txt index 9e0817e4452..821cd58bdbd 100644 --- a/tests/auto/corelib/io/qipaddress/CMakeLists.txt +++ b/tests/auto/corelib/io/qipaddress/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qipaddress SOURCES tst_qipaddress.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt index ea82bc03707..9e1eaf3e4a2 100644 --- a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qloggingcategory SOURCES tst_qloggingcategory.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt index 518258d77b5..3c42af9d013 100644 --- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND test_data "qtlogging.ini") add_qt_test(tst_qloggingregistry SOURCES tst_qloggingregistry.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/io/qsettings/CMakeLists.txt b/tests/auto/corelib/io/qsettings/CMakeLists.txt index 77ae908f930..161b03b041f 100644 --- a/tests/auto/corelib/io/qsettings/CMakeLists.txt +++ b/tests/auto/corelib/io/qsettings/CMakeLists.txt @@ -11,9 +11,8 @@ add_qt_test(tst_qsettings QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../kernel/qmetatype - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui ) diff --git a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt index c3b14dc6db2..08af02dc6c3 100644 --- a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qstorageinfo SOURCES tst_qstorageinfo.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt index 3a106e84537..855495bbbbe 100644 --- a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt +++ b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt @@ -10,6 +10,6 @@ add_qt_test(tst_qtemporarydir tst_qtemporarydir.cpp INCLUDE_DIRECTORIES ../../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::TestPrivate ) diff --git a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt index 693e2c674cd..af614552cc2 100644 --- a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND test_data "tst_qtemporaryfile.cpp") add_qt_test(tst_qtemporaryfile SOURCES tst_qtemporaryfile.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::TestPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt index c941d6811c2..5ad3bc19193 100644 --- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt +++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt @@ -12,7 +12,7 @@ add_qt_test(tst_qurlinternal SOURCES ../../codecs/utf8/utf8data.cpp tst_qurlinternal.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/io/qurlquery/CMakeLists.txt b/tests/auto/corelib/io/qurlquery/CMakeLists.txt index f35ff284a74..8a0cc54aebf 100644 --- a/tests/auto/corelib/io/qurlquery/CMakeLists.txt +++ b/tests/auto/corelib/io/qurlquery/CMakeLists.txt @@ -9,6 +9,6 @@ add_qt_test(tst_qurlquery tst_qurlquery.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt index 389fd55a9fb..ac952f64f7c 100644 --- a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qeventloop SOURCES tst_qeventloop.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network ) diff --git a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt index e0e03051b4c..888bfeaa78f 100644 --- a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qmetaobject SOURCES tst_qmetaobject.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt index b876807ba94..e7586d580b1 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qmetaobjectbuilder SOURCES tst_qmetaobjectbuilder.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt index 1cc577fda75..62d517c27d2 100644 --- a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt @@ -15,7 +15,7 @@ add_qt_test(tst_qmetatype QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt index 0a84d8bb0a0..3c9bb97825b 100644 --- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt @@ -15,7 +15,7 @@ add_qt_test(tst_qmetatype QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt index 5b8acb7a646..cb847dc5030 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt @@ -13,11 +13,10 @@ add_qt_test(tst_qsocketnotifier tst_qsocketnotifier.cpp INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/network - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:qsocketnotifier.pro:<TRUE>: diff --git a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt index 320f3a6705d..84585751ac9 100644 --- a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qtimer SOURCES tst_qtimer.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt index 102d847d959..dc676d11fed 100644 --- a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt @@ -12,7 +12,7 @@ add_qt_test(tst_qvariant QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt index b32b8835d4e..dff731cfc21 100644 --- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -12,7 +12,7 @@ add_qt_test(tst_qvariant QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt index af154db0ded..0f287a16524 100644 --- a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qwineventnotifier SOURCES tst_qwineventnotifier.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt index ef966a64243..990835c86a7 100644 --- a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qmimetype SOURCES tst_qmimetype.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt index b388bb65cf6..454b6c061a7 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ add_qt_test(tst_qfactoryloader ../plugin1/plugininterface1.h ../plugin2/plugininterface2.h ../tst_qfactoryloader.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt index 509a88da0c7..d532eeeb4bb 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt @@ -10,7 +10,7 @@ add_qt_test(tst_qfactoryloader ../plugin1/plugininterface1.h ../plugin2/plugininterface2.h ../tst_qfactoryloader.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt index 8bef9751681..c1c0d4b02b8 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt @@ -23,10 +23,8 @@ add_qt_test(tst_qpluginloader ##################################################################### extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Core + Qt::CorePrivate ) extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt index 92d72108423..b38b6223ed0 100644 --- a/tests/auto/corelib/serialization/json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/json/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_json SOURCES tst_qtjson.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt b/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt index 2085df02aae..c9cd01231b5 100644 --- a/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qbytedatabuffer SOURCES tst_qbytedatabuffer.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/text/qstringiterator/CMakeLists.txt b/tests/auto/corelib/text/qstringiterator/CMakeLists.txt index c74071957b2..e3388ee1b9f 100644 --- a/tests/auto/corelib/text/qstringiterator/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringiterator/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qstringiterator SOURCES tst_qstringiterator.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt index 14b7a73e6f0..671eeef6656 100644 --- a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt @@ -9,6 +9,6 @@ add_qt_test(tst_qfuture tst_qfuture.cpp DEFINES -QT_NO_JAVA_STYLE_ITERATORS - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qfuture/CMakeLists.txt b/tests/auto/corelib/thread/qfuture/CMakeLists.txt index 786913cc176..db1afabc0d6 100644 --- a/tests/auto/corelib/thread/qfuture/CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuture/CMakeLists.txt @@ -10,6 +10,6 @@ add_qt_test(tst_qfuture DEFINES # -QT_NO_JAVA_STYLE_ITERATORS # special case QT_STRICT_ITERATORS - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt index ef2ef5a7e4b..c27412daac7 100644 --- a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qfuturewatcher SOURCES tst_qfuturewatcher.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES Qt::Concurrent + Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qmutex/CMakeLists.txt b/tests/auto/corelib/thread/qmutex/CMakeLists.txt index 5916a337521..536802f1270 100644 --- a/tests/auto/corelib/thread/qmutex/CMakeLists.txt +++ b/tests/auto/corelib/thread/qmutex/CMakeLists.txt @@ -13,8 +13,6 @@ add_qt_test(tst_qmutex ##################################################################### extend_target(tst_qmutex CONDITION WIN32 - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Core + Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt index de295bc1295..f630bdc43b3 100644 --- a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt +++ b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qresultstore SOURCES tst_qresultstore.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/time/qdate/CMakeLists.txt b/tests/auto/corelib/time/qdate/CMakeLists.txt index 9a90956bd6b..b39828b5dfc 100644 --- a/tests/auto/corelib/time/qdate/CMakeLists.txt +++ b/tests/auto/corelib/time/qdate/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdate SOURCES tst_qdate.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/time/qdatetime/CMakeLists.txt b/tests/auto/corelib/time/qdatetime/CMakeLists.txt index b215ca6efad..e992936e60d 100644 --- a/tests/auto/corelib/time/qdatetime/CMakeLists.txt +++ b/tests/auto/corelib/time/qdatetime/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qdatetime SOURCES tst_qdatetime.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/time/qtimezone/CMakeLists.txt b/tests/auto/corelib/time/qtimezone/CMakeLists.txt index 7d9a8ccc88a..d95a2ac7675 100644 --- a/tests/auto/corelib/time/qtimezone/CMakeLists.txt +++ b/tests/auto/corelib/time/qtimezone/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qtimezone SOURCES tst_qtimezone.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt index ce7b0d0afbf..36b20c3b4fd 100644 --- a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qmakearray SOURCES tst_qmakearray.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt index f9eccf72ff6..4bab92b0c63 100644 --- a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qringbuffer SOURCES tst_qringbuffer.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt index 090f6e7fb68..fc5f59990ff 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt @@ -8,11 +8,9 @@ add_qt_test(tst_qdbusmarshall OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qdbusmarshall.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate - PUBLIC_LIBRARIES - Qt::DBus ) ## Scopes: diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt index 84976ee9231..bd615ab900c 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt @@ -8,11 +8,9 @@ add_qt_test(tst_qdbusmarshall OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qdbusmarshall.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate - PUBLIC_LIBRARIES - Qt::DBus ) ## Scopes: diff --git a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt index 1ffd6944d1b..31cf3aff44f 100644 --- a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt @@ -7,8 +7,6 @@ add_qt_test(tst_qdbusmetaobject SOURCES tst_qdbusmetaobject.cpp - LIBRARIES - Qt::DBusPrivate PUBLIC_LIBRARIES - Qt::DBus + Qt::DBusPrivate ) diff --git a/tests/auto/dbus/qdbustype/CMakeLists.txt b/tests/auto/dbus/qdbustype/CMakeLists.txt index 37ba25e017c..34456d6331e 100644 --- a/tests/auto/dbus/qdbustype/CMakeLists.txt +++ b/tests/auto/dbus/qdbustype/CMakeLists.txt @@ -7,11 +7,9 @@ add_qt_test(tst_qdbustype SOURCES tst_qdbustype.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate - PUBLIC_LIBRARIES - Qt::DBus ) ## Scopes: diff --git a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt index 71b223bdc69..879f8d28e47 100644 --- a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt +++ b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt @@ -7,10 +7,8 @@ add_qt_test(tst_qdbusxmlparser SOURCES tst_qdbusxmlparser.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate - PUBLIC_LIBRARIES - Qt::DBus Qt::Xml ) diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt index 6951f9a703f..865f1124b99 100644 --- a/tests/auto/gui/image/qimage/CMakeLists.txt +++ b/tests/auto/gui/image/qimage/CMakeLists.txt @@ -13,11 +13,10 @@ list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qimage SOURCES tst_qimage.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt index 93bf709c20e..8a96fa18cf5 100644 --- a/tests/auto/gui/image/qimagereader/CMakeLists.txt +++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt @@ -17,11 +17,10 @@ list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qimagereader SOURCES tst_qimagereader.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network TESTDATA ${test_data} ) diff --git a/tests/auto/gui/image/qpixmap/CMakeLists.txt b/tests/auto/gui/image/qpixmap/CMakeLists.txt index 32c60e95c39..f6a83aa0da0 100644 --- a/tests/auto/gui/image/qpixmap/CMakeLists.txt +++ b/tests/auto/gui/image/qpixmap/CMakeLists.txt @@ -25,11 +25,10 @@ list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qpixmap SOURCES tst_qpixmap.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) @@ -96,10 +95,9 @@ add_qt_resource(tst_qpixmap "qpixmap" ##################################################################### extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Widgets + Qt::WidgetsPrivate ) extend_target(tst_qpixmap CONDITION WIN32 AND NOT WINRT diff --git a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt index 584e77c9862..ef73f60ca6e 100644 --- a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt +++ b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qpixmapcache SOURCES tst_qpixmapcache.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt index 7161c47db16..82de116f8d6 100644 --- a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt +++ b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_noqteventloop SOURCES tst_noqteventloop.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network ) diff --git a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt index d6571961131..639e88fb4cc 100644 --- a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt +++ b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qbackingstore SOURCES tst_qbackingstore.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt index 1874a33794b..30a6436ecea 100644 --- a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt @@ -16,11 +16,9 @@ add_qt_test(tst_qguiapplication QT_DISABLE_DEPRECATED_BEFORE=0x050E00 INCLUDE_DIRECTORIES ../../../corelib/kernel/qcoreapplication - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Gui ) # Resources: diff --git a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt index 09498e2a39a..5bfb10eba95 100644 --- a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt @@ -16,11 +16,9 @@ add_qt_test(tst_qguiapplication QT_DISABLE_DEPRECATED_BEFORE=0x050E00 INCLUDE_DIRECTORIES ../../../corelib/kernel/qcoreapplication - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Gui Threads::Threads # special case ) diff --git a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt index c4daa5a310c..de9a876e9d7 100644 --- a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qguieventloop SOURCES ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Network ) diff --git a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt index 6d0f3cbbee3..c4e5117e8ca 100644 --- a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qguitimer SOURCES ../../../corelib/kernel/qtimer/tst_qtimer.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui ) diff --git a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt index 5f255d49e4d..2be3339fe36 100644 --- a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qguitimer SOURCES ../../../corelib/kernel/qtimer/tst_qtimer.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Threads::Threads # special case ) diff --git a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt index f0f09818e55..2eee15b816e 100644 --- a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt +++ b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qinputmethod SOURCES tst_qinputmethod.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt index 01f03fac760..07e480c9dd2 100644 --- a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt +++ b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qkeysequence SOURCES tst_qkeysequence.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt index c8e37898863..4176be98408 100644 --- a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt +++ b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qopenglwindow SOURCES tst_qopenglwindow.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::OpenGL ) diff --git a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt index 61e1be44fdb..9b586ce4c86 100644 --- a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt +++ b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qrasterwindow SOURCES tst_qrasterwindow.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/kernel/qscreen/CMakeLists.txt b/tests/auto/gui/kernel/qscreen/CMakeLists.txt index 2e2a04f9691..dd54db47534 100644 --- a/tests/auto/gui/kernel/qscreen/CMakeLists.txt +++ b/tests/auto/gui/kernel/qscreen/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qscreen SOURCES tst_qscreen.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt index 148ab2be8d1..d12e1da1065 100644 --- a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt +++ b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsurfaceformat SOURCES tst_qsurfaceformat.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt index 2a74918f8ab..7d489e3066e 100644 --- a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt +++ b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtouchevent SOURCES tst_qtouchevent.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/auto/gui/kernel/qwindow/CMakeLists.txt b/tests/auto/gui/kernel/qwindow/CMakeLists.txt index c5a56a5a06f..cfd17219bdd 100644 --- a/tests/auto/gui/kernel/qwindow/CMakeLists.txt +++ b/tests/auto/gui/kernel/qwindow/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qwindow SOURCES tst_qwindow.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) ## Scopes: diff --git a/tests/auto/gui/qopengl/CMakeLists.txt b/tests/auto/gui/qopengl/CMakeLists.txt index 30c1ec94b32..1c7c9b6ec00 100644 --- a/tests/auto/gui/qopengl/CMakeLists.txt +++ b/tests/auto/gui/qopengl/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qopengl SOURCES tst_qopengl.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::OpenGL ) diff --git a/tests/auto/gui/qopenglconfig/CMakeLists.txt b/tests/auto/gui/qopenglconfig/CMakeLists.txt index bcac684cf97..26ce58d98c2 100644 --- a/tests/auto/gui/qopenglconfig/CMakeLists.txt +++ b/tests/auto/gui/qopenglconfig/CMakeLists.txt @@ -10,10 +10,9 @@ list(APPEND test_data "buglist.json") add_qt_test(tst_qopenglconfig SOURCES tst_qopenglconfig.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/gui/qvulkan/CMakeLists.txt b/tests/auto/gui/qvulkan/CMakeLists.txt index ad8a9f9e67f..6316aa8f685 100644 --- a/tests/auto/gui/qvulkan/CMakeLists.txt +++ b/tests/auto/gui/qvulkan/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qvulkan SOURCES tst_qvulkan.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/rhi/qrhi/CMakeLists.txt b/tests/auto/gui/rhi/qrhi/CMakeLists.txt index 27c8a731e79..8c3026c176a 100644 --- a/tests/auto/gui/rhi/qrhi/CMakeLists.txt +++ b/tests/auto/gui/rhi/qrhi/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qrhi SOURCES tst_qrhi.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/auto/gui/rhi/qshader/CMakeLists.txt b/tests/auto/gui/rhi/qshader/CMakeLists.txt index 9d9352ef1ef..472fc3b7e42 100644 --- a/tests/auto/gui/rhi/qshader/CMakeLists.txt +++ b/tests/auto/gui/rhi/qshader/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qshader SOURCES tst_qshader.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/auto/gui/text/qcssparser/CMakeLists.txt b/tests/auto/gui/text/qcssparser/CMakeLists.txt index 869eebbf953..09e1672bc48 100644 --- a/tests/auto/gui/text/qcssparser/CMakeLists.txt +++ b/tests/auto/gui/text/qcssparser/CMakeLists.txt @@ -16,10 +16,9 @@ add_qt_test(tst_qcssparser tst_qcssparser.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Xml TESTDATA ${test_data} ) diff --git a/tests/auto/gui/text/qfont/CMakeLists.txt b/tests/auto/gui/text/qfont/CMakeLists.txt index 1f063ab8b24..a04f8365b12 100644 --- a/tests/auto/gui/text/qfont/CMakeLists.txt +++ b/tests/auto/gui/text/qfont/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qfont SOURCES tst_qfont.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/auto/gui/text/qfontcache/CMakeLists.txt b/tests/auto/gui/text/qfontcache/CMakeLists.txt index dc5e76c91dc..84f6373328b 100644 --- a/tests/auto/gui/text/qfontcache/CMakeLists.txt +++ b/tests/auto/gui/text/qfontcache/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qfontcache SOURCES tst_qfontcache.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt index 32affde1ca4..65c6224a001 100644 --- a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt +++ b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt @@ -10,11 +10,10 @@ list(APPEND test_data "LED_REAL.TTF") add_qt_test(tst_qfontdatabase SOURCES tst_qfontdatabase.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt index 10ba5dd791e..029f5d5ce3f 100644 --- a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt +++ b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qfontmetrics SOURCES tst_qfontmetrics.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt index 8c379bffc33..e544fb313c0 100644 --- a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt +++ b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qinputcontrol SOURCES tst_qinputcontrol.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qrawfont/CMakeLists.txt b/tests/auto/gui/text/qrawfont/CMakeLists.txt index 41093ee6031..5044866c499 100644 --- a/tests/auto/gui/text/qrawfont/CMakeLists.txt +++ b/tests/auto/gui/text/qrawfont/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qrawfont SOURCES tst_qrawfont.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/auto/gui/text/qstatictext/CMakeLists.txt b/tests/auto/gui/text/qstatictext/CMakeLists.txt index c2b53e731c0..80eef2f2549 100644 --- a/tests/auto/gui/text/qstatictext/CMakeLists.txt +++ b/tests/auto/gui/text/qstatictext/CMakeLists.txt @@ -15,10 +15,7 @@ add_qt_test(tst_qstatictext ##################################################################### extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui ) diff --git a/tests/auto/gui/text/qtextblock/CMakeLists.txt b/tests/auto/gui/text/qtextblock/CMakeLists.txt index ca461a37d58..18e0be18c60 100644 --- a/tests/auto/gui/text/qtextblock/CMakeLists.txt +++ b/tests/auto/gui/text/qtextblock/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextblock SOURCES tst_qtextblock.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextcursor/CMakeLists.txt b/tests/auto/gui/text/qtextcursor/CMakeLists.txt index 2e129d02620..78b6ed191da 100644 --- a/tests/auto/gui/text/qtextcursor/CMakeLists.txt +++ b/tests/auto/gui/text/qtextcursor/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextcursor SOURCES tst_qtextcursor.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextdocument/CMakeLists.txt b/tests/auto/gui/text/qtextdocument/CMakeLists.txt index 5ac40ee8b6b..7ea22d3fb0f 100644 --- a/tests/auto/gui/text/qtextdocument/CMakeLists.txt +++ b/tests/auto/gui/text/qtextdocument/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_test(tst_qtextdocument SOURCES common.h tst_qtextdocument.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Xml ) diff --git a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt index 09469b7c7f3..f92a82a262e 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt +++ b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextdocumentfragment SOURCES tst_qtextdocumentfragment.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextformat/CMakeLists.txt b/tests/auto/gui/text/qtextformat/CMakeLists.txt index 5635141476e..be7653abd46 100644 --- a/tests/auto/gui/text/qtextformat/CMakeLists.txt +++ b/tests/auto/gui/text/qtextformat/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextformat SOURCES tst_qtextformat.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextlayout/CMakeLists.txt b/tests/auto/gui/text/qtextlayout/CMakeLists.txt index b43c009b997..c87d5bdd4dd 100644 --- a/tests/auto/gui/text/qtextlayout/CMakeLists.txt +++ b/tests/auto/gui/text/qtextlayout/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextlayout SOURCES tst_qtextlayout.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextlist/CMakeLists.txt b/tests/auto/gui/text/qtextlist/CMakeLists.txt index 80e4623ce5c..f22de38a8c6 100644 --- a/tests/auto/gui/text/qtextlist/CMakeLists.txt +++ b/tests/auto/gui/text/qtextlist/CMakeLists.txt @@ -8,9 +8,8 @@ add_qt_test(tst_qtextlist SOURCES ../qtextdocument/common.h tst_qtextlist.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt index 4e1f54a1170..6a1043c89f4 100644 --- a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt +++ b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt @@ -13,10 +13,9 @@ add_qt_test(tst_qtextmarkdownimporter tst_qtextmarkdownimporter.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt index c7695bff976..7360b409949 100644 --- a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt +++ b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt @@ -13,10 +13,9 @@ add_qt_test(tst_qtextmarkdownwriter tst_qtextmarkdownwriter.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt index f21648cfc78..18c84e5a45e 100644 --- a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt +++ b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt @@ -9,9 +9,8 @@ add_qt_test(tst_qtextodfwriter tst_qtextodfwriter.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt index a1caa47e4e6..5fb8db54054 100644 --- a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt +++ b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt @@ -15,11 +15,10 @@ add_qt_test(tst_qtextpiecetable SOURCES ../qtextdocument/common.h tst_qtextpiecetable.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:qtextpiecetable.pro:<TRUE>: diff --git a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt index 1a3b8cfa923..8d94e33b6cf 100644 --- a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt +++ b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextscriptengine SOURCES tst_qtextscriptengine.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt index bdda60149c9..b2434569d48 100644 --- a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt +++ b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt @@ -11,8 +11,7 @@ add_qt_executable(generate INCLUDE_DIRECTORIES . /usr/include/freetype2 - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui ) diff --git a/tests/auto/gui/text/qtexttable/CMakeLists.txt b/tests/auto/gui/text/qtexttable/CMakeLists.txt index 219a8689534..de82c942332 100644 --- a/tests/auto/gui/text/qtexttable/CMakeLists.txt +++ b/tests/auto/gui/text/qtexttable/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qtexttable SOURCES tst_qtexttable.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) ## Scopes: diff --git a/tests/auto/gui/text/qzip/CMakeLists.txt b/tests/auto/gui/text/qzip/CMakeLists.txt index 034e52e1fd7..dfeb968cc1a 100644 --- a/tests/auto/gui/text/qzip/CMakeLists.txt +++ b/tests/auto/gui/text/qzip/CMakeLists.txt @@ -10,10 +10,9 @@ list(APPEND test_data "testdata") add_qt_test(tst_qzip SOURCES tst_qzip.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt index a12cabbf84d..e9cb62377fe 100644 --- a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt +++ b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qshadergenerator SOURCES tst_qshadergenerator.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/util/qshadergraph/CMakeLists.txt b/tests/auto/gui/util/qshadergraph/CMakeLists.txt index 0e5eef8dd5d..ede24f2a40b 100644 --- a/tests/auto/gui/util/qshadergraph/CMakeLists.txt +++ b/tests/auto/gui/util/qshadergraph/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qshadergraph SOURCES tst_qshadergraph.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt index 683df0029fb..caf863d42db 100644 --- a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt +++ b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qshadergraphloader SOURCES tst_qshadergraphloader.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/util/qshadernodes/CMakeLists.txt b/tests/auto/gui/util/qshadernodes/CMakeLists.txt index e70c36e8f88..d7cc14b09cd 100644 --- a/tests/auto/gui/util/qshadernodes/CMakeLists.txt +++ b/tests/auto/gui/util/qshadernodes/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qshadernodes SOURCES tst_qshadernodes.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt index 226eac25a36..e381af4f7b1 100644 --- a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt +++ b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qshadernodesloader SOURCES tst_qshadernodesloader.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt index abb48884d35..3b6d99c0e8f 100644 --- a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt +++ b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qtexturefilereader SOURCES tst_qtexturefilereader.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/auto/network/access/hpack/CMakeLists.txt b/tests/auto/network/access/hpack/CMakeLists.txt index 531246ecf0b..e1c5c1a4694 100644 --- a/tests/auto/network/access/hpack/CMakeLists.txt +++ b/tests/auto/network/access/hpack/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_hpack SOURCES tst_hpack.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:hpack.pro:<TRUE>: diff --git a/tests/auto/network/access/hsts/CMakeLists.txt b/tests/auto/network/access/hsts/CMakeLists.txt index f2d09a63951..804ebedf614 100644 --- a/tests/auto/network/access/hsts/CMakeLists.txt +++ b/tests/auto/network/access/hsts/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qhsts SOURCES tst_qhsts.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:hsts.pro:<TRUE>: diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt index 082da570e7c..51c7c18eace 100644 --- a/tests/auto/network/access/http2/CMakeLists.txt +++ b/tests/auto/network/access/http2/CMakeLists.txt @@ -13,9 +13,8 @@ add_qt_test(tst_http2 SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" INCLUDE_DIRECTORIES ../../../../shared - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate ) diff --git a/tests/auto/network/access/qftp/CMakeLists.txt b/tests/auto/network/access/qftp/CMakeLists.txt index 4c706febddd..9887e1eea6f 100644 --- a/tests/auto/network/access/qftp/CMakeLists.txt +++ b/tests/auto/network/access/qftp/CMakeLists.txt @@ -11,10 +11,9 @@ endif() add_qt_test(tst_qftp SOURCES tst_qftp.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:qftp.pro:<TRUE>: diff --git a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt index b1b2059952a..6ab8876c82b 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt @@ -11,11 +11,9 @@ endif() add_qt_test(tst_qhttpnetworkconnection SOURCES tst_qhttpnetworkconnection.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhttpnetworkconnection.pro:<TRUE>: diff --git a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt index c381ec7b3b6..8c68a18da6f 100644 --- a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt @@ -11,11 +11,9 @@ endif() add_qt_test(tst_qhttpnetworkreply SOURCES tst_qhttpnetworkreply.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhttpnetworkreply.pro:<TRUE>: diff --git a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt index a9296cf3f09..929388a10ab 100644 --- a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt @@ -10,10 +10,9 @@ list(APPEND test_data "parser.json") add_qt_test(tst_qnetworkcookiejar SOURCES tst_qnetworkcookiejar.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt index 97d0da3d343..48759572de6 100644 --- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -23,11 +23,9 @@ add_qt_test(tst_qnetworkreply ../tst_qnetworkreply.cpp INCLUDE_DIRECTORIES ../../../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network TESTDATA ${test_data} ) diff --git a/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt index 0df7ce71da5..e164bccbdf8 100644 --- a/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt +++ b/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_test(tst_qnetworksession SOURCES ../../qbearertestcommon.h tst_qnetworksession.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) ## Scopes: diff --git a/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt index cbc6348d4d9..c86966600d5 100644 --- a/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt +++ b/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt @@ -9,10 +9,9 @@ add_qt_test(tst_qnetworksession SOURCES ../../qbearertestcommon.h tst_qnetworksession.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) ## Scopes: diff --git a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt index 80d6667a214..f461591884d 100644 --- a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt +++ b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt @@ -13,10 +13,8 @@ add_qt_test(tst_qauthenticator tst_qauthenticator.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:qauthenticator.pro:<TRUE>: diff --git a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt index 51de80402f8..f967625d386 100644 --- a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt +++ b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt @@ -7,10 +7,8 @@ add_qt_test(tst_qhostaddress SOURCES tst_qhostaddress.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate ) ## Scopes: diff --git a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt index 60077d00219..19eae0611d7 100644 --- a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt +++ b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt @@ -11,11 +11,9 @@ endif() add_qt_test(tst_qhostinfo SOURCES tst_qhostinfo.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhostinfo.pro:<TRUE>: diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt index 3fd139b93e0..ecacd338ab8 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt +++ b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt @@ -7,8 +7,6 @@ add_qt_test(tst_qnetworkproxyfactory SOURCES tst_qnetworkproxyfactory.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate ) diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt index bb681d9e2fb..1dece78966c 100644 --- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_platformsocketengine tst_platformsocketengine.cpp INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/network - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:platformsocketengine.pro:<TRUE>: diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt index 8dfa61c5ac7..6aeec0a9836 100644 --- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_qhttpsocketengine tst_qhttpsocketengine.cpp INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/network - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhttpsocketengine.pro:<TRUE>: diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt index 41a958a36ef..fd58b931e6e 100644 --- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_qsocks5socketengine tst_qsocks5socketengine.cpp INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/network - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qsocks5socketengine.pro:<TRUE>: diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt index 238c6b99316..61b8d257360 100644 --- a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt @@ -7,11 +7,9 @@ add_qt_test(tst_qtcpsocket SOURCES ../tst_qtcpsocket.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) ## Scopes: diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index 9523830a150..57fafe7a04b 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -7,11 +7,9 @@ add_qt_test(tst_qtcpsocket SOURCES ../tst_qtcpsocket.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) ## Scopes: diff --git a/tests/auto/network/ssl/qasn1element/CMakeLists.txt b/tests/auto/network/ssl/qasn1element/CMakeLists.txt index 70738d65254..aa9ff580123 100644 --- a/tests/auto/network/ssl/qasn1element/CMakeLists.txt +++ b/tests/auto/network/ssl/qasn1element/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qasn1element SOURCES tst_qasn1element.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) diff --git a/tests/auto/network/ssl/qdtls/CMakeLists.txt b/tests/auto/network/ssl/qdtls/CMakeLists.txt index ce0f029f057..77bf65f1994 100644 --- a/tests/auto/network/ssl/qdtls/CMakeLists.txt +++ b/tests/auto/network/ssl/qdtls/CMakeLists.txt @@ -10,10 +10,8 @@ list(APPEND test_data "certs") add_qt_test(tst_qdtls SOURCES tst_qdtls.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt index 1df4de743df..827716c3b74 100644 --- a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt +++ b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt @@ -7,10 +7,8 @@ add_qt_test(tst_qdtlscookie SOURCES tst_qdtlscookie.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate ) ## Scopes: diff --git a/tests/auto/network/ssl/qocsp/CMakeLists.txt b/tests/auto/network/ssl/qocsp/CMakeLists.txt index 4bace58e441..399711f9a03 100644 --- a/tests/auto/network/ssl/qocsp/CMakeLists.txt +++ b/tests/auto/network/ssl/qocsp/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qocsp SOURCES tst_qocsp.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) ## Scopes: diff --git a/tests/auto/network/ssl/qsslkey/CMakeLists.txt b/tests/auto/network/ssl/qsslkey/CMakeLists.txt index 8b16325559e..04634d1997d 100644 --- a/tests/auto/network/ssl/qsslkey/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslkey/CMakeLists.txt @@ -26,10 +26,7 @@ add_qt_test(tst_qsslkey ##################################################################### extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Network ) diff --git a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt index 601165d55d6..99ec2ad823a 100644 --- a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt @@ -16,11 +16,9 @@ add_qt_test(tst_qsslsocket tst_qsslsocket.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network TESTDATA ${test_data} ) diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt index b3d8626da9d..c377e0a46a5 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_qsslsocket_onDemandCertificates_member tst_qsslsocket_onDemandCertificates_member.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_member.pro:<TRUE>: diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt index b71d0a4f8b0..f3a31788795 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_qsslsocket_onDemandCertificates_static tst_qsslsocket_onDemandCertificates_static.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_static.pro:<TRUE>: diff --git a/tests/auto/other/lancelot/CMakeLists.txt b/tests/auto/other/lancelot/CMakeLists.txt index f06586d3d4d..6f15ff7990b 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 d93808848b2..f5c43b0ed19 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 316d8f72326..4923568a89c 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 898abf16f41..de69c437655 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 49a5664dedc..7765557248d 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 85d938e100f..8663e412c40 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 0b98cae5f96..f5f74bbafc1 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 adfb7e5a836..7111e9cf57c 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 905e68edc4e..ae6e7c4205b 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 883fabe01ac..ee504faaf7e 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 044b1765558..a2406c034a5 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 ee170b3a773..51af17d866d 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 fbbe5c67bbc..93a02eea12b 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 ) diff --git a/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt b/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt index 60a60163280..1ddb49d8e9e 100644 --- a/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt +++ b/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt @@ -9,9 +9,7 @@ add_qt_test(tst_qprintdevice tst_qprintdevice.cpp DEFINES QT_USE_USING_NAMESPACE - LIBRARIES - Qt::PrintSupportPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::PrintSupport + Qt::PrintSupportPrivate ) diff --git a/tests/auto/sql/kernel/qsql/CMakeLists.txt b/tests/auto/sql/kernel/qsql/CMakeLists.txt index 88c2d9ee3c2..c3c3eac7d26 100644 --- a/tests/auto/sql/kernel/qsql/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsql/CMakeLists.txt @@ -7,9 +7,7 @@ add_qt_test(tst_qsql SOURCES tst_qsql.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::SqlPrivate - PUBLIC_LIBRARIES - Qt::Sql ) diff --git a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt index ad0cefa460d..ae64269c114 100644 --- a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsqldatabase SOURCES tst_qsqldatabase.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt index a59ee08ea78..30ce3c10531 100644 --- a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsqldriver SOURCES tst_qsqldriver.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt index dd7703b4013..a5d3c96baa4 100644 --- a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsqlquery SOURCES tst_qsqlquery.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt index 91762a0f6c3..c150c8a9d75 100644 --- a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt @@ -8,9 +8,8 @@ add_qt_test(tst_qsqlresult SOURCES testsqldriver.h tst_qsqlresult.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt index 793e8c7fd55..17e66f42dd4 100644 --- a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsqlthread SOURCES tst_qsqlthread.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt index 1c8a2372b69..f2da569f8f8 100644 --- a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt +++ b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qsqlquerymodel SOURCES tst_qsqlquerymodel.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Sql + Qt::SqlPrivate Qt::Widgets ) diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt index 979d3a4f434..caadae1df5b 100644 --- a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt +++ b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qsqlrelationaldelegate SOURCES tst_qsqlrelationaldelegate.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate Qt::Widgets ) diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt index 2dea59b79d0..f695a6173e0 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsqlrelationaltablemodel SOURCES tst_qsqlrelationaltablemodel.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt index a251847181d..f3e703591f2 100644 --- a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt +++ b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsqltablemodel SOURCES tst_qsqltablemodel.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt index 7840ba51ba1..755cbecd2e4 100644 --- a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_executable(badxml SOURCES tst_badxml.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) diff --git a/tests/auto/testlib/selftests/badxml/CMakeLists.txt b/tests/auto/testlib/selftests/badxml/CMakeLists.txt index c26edd4d08b..40870b19834 100644 --- a/tests/auto/testlib/selftests/badxml/CMakeLists.txt +++ b/tests/auto/testlib/selftests/badxml/CMakeLists.txt @@ -9,9 +9,8 @@ add_qt_executable(badxml OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES tst_badxml.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt index 285f614f4ae..37895585080 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt @@ -8,10 +8,8 @@ add_qt_executable(benchlibtickcounter GUI SOURCES tst_benchlibtickcounter.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt index 9aba4104ac3..1edf2826ad5 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt @@ -10,10 +10,8 @@ add_qt_executable(benchlibtickcounter GUI SOURCES tst_benchlibtickcounter.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt index 322b85fd083..d1eae1a7839 100644 --- a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt @@ -8,10 +8,8 @@ add_qt_executable(blacklisted GUI SOURCES tst_blacklisted.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt index a828d628ba3..8136abe3ab1 100644 --- a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt +++ b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt @@ -10,10 +10,8 @@ add_qt_executable(blacklisted GUI SOURCES tst_blacklisted.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt index e45839faeeb..86c58467bf1 100644 --- a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt @@ -7,12 +7,11 @@ add_qt_executable(keyboard SOURCES tst_keyboard.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt index 4b98a88253a..2766c1a36cb 100644 --- a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt +++ b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt @@ -9,12 +9,11 @@ add_qt_executable(keyboard OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES tst_keyboard.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt index 0ba47c3b978..4308195d73b 100644 --- a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt @@ -7,12 +7,11 @@ add_qt_executable(mouse SOURCES tst_mouse.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/mouse/CMakeLists.txt b/tests/auto/testlib/selftests/mouse/CMakeLists.txt index 441569bd91a..9f6b364cecc 100644 --- a/tests/auto/testlib/selftests/mouse/CMakeLists.txt +++ b/tests/auto/testlib/selftests/mouse/CMakeLists.txt @@ -9,12 +9,11 @@ add_qt_executable(mouse OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES tst_mouse.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt index d7c26b804d4..e5989ba69ed 100644 --- a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt @@ -8,10 +8,8 @@ add_qt_executable(signaldumper GUI SOURCES tst_signaldumper.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt index b4318757226..0376ffacd16 100644 --- a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt +++ b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt @@ -10,10 +10,8 @@ add_qt_executable(signaldumper GUI SOURCES tst_signaldumper.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt index ec645eee970..ebe7d6e2992 100644 --- a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt @@ -8,10 +8,8 @@ add_qt_executable(silent GUI SOURCES tst_silent.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/testlib/selftests/silent/CMakeLists.txt b/tests/auto/testlib/selftests/silent/CMakeLists.txt index f02e38b75de..23916b81e01 100644 --- a/tests/auto/testlib/selftests/silent/CMakeLists.txt +++ b/tests/auto/testlib/selftests/silent/CMakeLists.txt @@ -10,10 +10,8 @@ add_qt_executable(silent GUI SOURCES tst_silent.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt index 13201d23843..2c003f6fb63 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 745e65b3322..7b6d0047768 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 4989c312c9f..2fb610a7840 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 c4baa3fc129..38c05473908 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 345822ac79d..af858c8946a 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 b9d9ef04a10..7cd02a04c0c 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 882cc143e18..ae12c58ca23 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 bc7d9f26ed0..d1e2a6686c6 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 b6cd4fa9346..4cdeb6b4e50 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 31dbe569070..6ffd2c40299 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 6c213bc2099..db323fcb15a 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 a6739093b48..9d9fc688320 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 6becd124bf1..ac1ac91f8b1 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 b500ec487a6..1be66372b61 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 6fd82737086..0e29191792d 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 77af1c5a830..accec5ff40e 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 ddc377799f7..c566b6c1bfa 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 b8a5fcd9058..5fa72f7b46b 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:<TRUE>: diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt index 191cc9a9c06..17c9571d625 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:<TRUE>: diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt index 9c49a957c0e..7325f7eb217 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 02c52ed42db..520a0b4b981 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 47e6a1ee356..d33e3b9c2e1 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 8a4cebe7d51..8949ac49575 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 f97940b28ac..af1bac9ff02 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 1c7c5ae7fe8..07c290128e5 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 853b463893a..aebcb4c49e9 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 0906f4c5a15..20e50d2de33 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 4914f705ab4..40a6a1a6d65 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 67f98382f18..469cc4d5977 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 af5138c7565..40e612f0de3 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 bc2ef1000f9..171ee1b2738 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 dca063e2f0a..901d20f1e3b 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 48e1431a356..f786f3331c3 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 7041320dd02..61bf8d303ae 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 86661e505ad..79995454f7d 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 2a3526722ea..e63a80117fd 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 440421a3ea9..582f0d582db 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 df2056476b7..849dfea52a4 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 c3fc672c177..201c271103f 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 887ecda4afc..06a4156b57d 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 59d33b95890..44053dbe3d9 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 1400c946337..21d81113f49 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 ca1a2ee0622..01c4df38fec 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 ffc47a8319d..fb87c3beecc 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 2a1e0dc4273..b6c6efcc2f8 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 c00064446bb..48a174b6e1a 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 275f80db95c..0dbbf632399 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 ecfe26fb5c1..32c814c535b 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 ba128402110..95fbe14eec7 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 9d9f641f929..8eb294d361d 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 415498c649f..e2b6cc59423 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 3d6d055fedb..a4fe508a02a 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 6e9d80ee668..f95094aa7d2 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 292ab5aeb13..55bcf941d0a 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 d796baf93da..961bd094922 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 9844b9192fc..791d411970c 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 4c1863d9ef3..a20fe704922 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 cc1ce337ea8..43875cd1134 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 1f5bb2dff84..d9e447d38be 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 0774967c8ce..4106de04dee 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 92b8049ef6b..83d091755f7 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 5cf53d1be57..9bd00180824 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 db077d63548..61641707b97 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 43803ccdffd..d3aef03fa18 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 ) diff --git a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt index f69f7cfca71..7d1e19d75a9 100644 --- a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_benchmark(tst_bench_qfile SOURCES main.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) diff --git a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt index f0c93f3b559..195419f52ef 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_benchmark(tst_bench_qfileinfo SOURCES main.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) diff --git a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt index 90a9960f68c..00bbe74c2d5 100644 --- a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_benchmark(tst_bench_qprocess SOURCES ../tst_bench_qprocess.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) diff --git a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt index c85020606ae..d582dba8dbe 100644 --- a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_benchmark(tst_bench_qreadwritelock SOURCES tst_qreadwritelock.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) diff --git a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt index dade4273fae..e0323b90db9 100644 --- a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_benchmark(tst_bench_qringbuffer SOURCES main.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) diff --git a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt index 75ac16cad62..530d55b19b7 100644 --- a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_benchmark(tst_bench_stack SOURCES main.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) diff --git a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt index 19575872bcd..0cc9b24236b 100644 --- a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt @@ -10,8 +10,7 @@ add_qt_benchmark(tst_bench_vector outofline.cpp INCLUDE_DIRECTORIES . - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) diff --git a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt index 1b663ac19fe..fb250f9f00b 100644 --- a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt +++ b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt @@ -7,11 +7,9 @@ add_qt_benchmark(tst_bench_qdbustype SOURCES main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate - PUBLIC_LIBRARIES - Qt::DBus Qt::Test ) diff --git a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt index 2798fe4dbb5..e75703f33da 100644 --- a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_qpixmap SOURCES tst_qpixmap.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt b/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt index b108753c93e..add15f25fb6 100644 --- a/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_drawtexture SOURCES tst_drawtexture.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt index a4c673af9be..677a3d98d4e 100644 --- a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_benchmark(tst_bench_lancebench SOURCES ../../../../auto/other/lancelot/paintcommands.cpp ../../../../auto/other/lancelot/paintcommands.h tst_lancebench.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt b/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt index 2e365678e9a..d5367704ae3 100644 --- a/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_qcolor SOURCES tst_qcolor.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt index 926af40a2e5..a4e3242409a 100644 --- a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt @@ -7,13 +7,12 @@ add_qt_benchmark(tst_bench_qpainter SOURCES tst_qpainter.cpp - LIBRARIES - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test Qt::Widgets + Qt::WidgetsPrivate ) #### Keys ignored in scope 1:.:.:qpainter.pro:<TRUE>: diff --git a/tests/benchmarks/gui/text/qtext/CMakeLists.txt b/tests/benchmarks/gui/text/qtext/CMakeLists.txt index a6d4952ebad..b2380c83161 100644 --- a/tests/benchmarks/gui/text/qtext/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qtext/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_QText SOURCES main.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt b/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt index 1b956b459b0..eb1f633d9b9 100644 --- a/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_QTextDocument SOURCES main.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt index 19c62103d84..c77f7b56f8a 100644 --- a/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt +++ b/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_benchmark(tst_bench_qnetworkreply SOURCES tst_qnetworkreply.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt b/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt index 5133fdc608a..f234b5d7a47 100644 --- a/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt +++ b/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_benchmark(tst_bench_qhostinfo SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/benchmarks/opengl/CMakeLists.txt b/tests/benchmarks/opengl/CMakeLists.txt index 070916cc9b1..bbee0725873 100644 --- a/tests/benchmarks/opengl/CMakeLists.txt +++ b/tests/benchmarks/opengl/CMakeLists.txt @@ -9,13 +9,12 @@ add_qt_benchmark(tst_bench_opengl main.cpp DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::OpenGLPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::OpenGL + Qt::OpenGLPrivate Qt::Test ) diff --git a/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt b/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt index ed0ae904618..95e3aca2216 100644 --- a/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt +++ b/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_qsqlquery SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate Qt::Test ) diff --git a/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt b/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt index ea9acba0881..b55d46984f6 100644 --- a/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt +++ b/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_qsqlrecord SOURCES tst_qsqlrecord.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate Qt::Test ) diff --git a/tests/manual/cocoa/wheelevent/CMakeLists.txt b/tests/manual/cocoa/wheelevent/CMakeLists.txt index b3c1a102263..305036fa781 100644 --- a/tests/manual/cocoa/wheelevent/CMakeLists.txt +++ b/tests/manual/cocoa/wheelevent/CMakeLists.txt @@ -9,11 +9,10 @@ add_qt_manual_test(wheelevent SOURCES main.cpp window.cpp window.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt index a40a655f4d3..02c0893cdeb 100644 --- a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt +++ b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt @@ -16,11 +16,10 @@ add_qt_manual_test(embeddedintoforeignwindow QT_DIAG_LIB INCLUDE_DIRECTORIES ../diaglib - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:embeddedintoforeignwindow.pro:<TRUE>: @@ -46,10 +45,8 @@ extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h ../diaglib/logwidget.cpp ../diaglib/logwidget.h ../diaglib/qwidgetdump.cpp ../diaglib/qwidgetdump.h - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES - Qt::Widgets + Qt::WidgetsPrivate ) extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt index 707d7e7056a..8a7f5251981 100644 --- a/tests/manual/foreignwindows/CMakeLists.txt +++ b/tests/manual/foreignwindows/CMakeLists.txt @@ -15,11 +15,10 @@ add_qt_manual_test(foreignwindows QT_DIAG_LIB INCLUDE_DIRECTORIES ../diaglib - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) @@ -46,10 +45,8 @@ extend_target(foreignwindows CONDITION QT_FEATURE_widgets ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h ../diaglib/logwidget.cpp ../diaglib/logwidget.h ../diaglib/qwidgetdump.cpp ../diaglib/qwidgetdump.h - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES - Qt::Widgets + Qt::WidgetsPrivate ) extend_target(foreignwindows CONDITION QT_FEATURE_opengl diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt index b1983ff00ac..dee2d1ae438 100644 --- a/tests/manual/highdpi/CMakeLists.txt +++ b/tests/manual/highdpi/CMakeLists.txt @@ -12,10 +12,9 @@ add_qt_manual_test(highdpi HAVE_SCREEN_BASE_DPI INCLUDE_DIRECTORIES . - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt index bf4021f60f6..ea7be24e762 100644 --- a/tests/manual/lance/CMakeLists.txt +++ b/tests/manual/lance/CMakeLists.txt @@ -13,11 +13,10 @@ add_qt_manual_test(lance INCLUDE_DIRECTORIES . ../../auto/other/lancelot - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::PrintSupport Qt::Widgets ) diff --git a/tests/manual/network_remote_stresstest/CMakeLists.txt b/tests/manual/network_remote_stresstest/CMakeLists.txt index 4293925a8fa..46db952b46e 100644 --- a/tests/manual/network_remote_stresstest/CMakeLists.txt +++ b/tests/manual/network_remote_stresstest/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_manual_test(tst_network_remote_stresstest SOURCES tst_network_remote_stresstest.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/manual/network_stresstest/CMakeLists.txt b/tests/manual/network_stresstest/CMakeLists.txt index a8ba9e29b6f..310c62dae81 100644 --- a/tests/manual/network_stresstest/CMakeLists.txt +++ b/tests/manual/network_stresstest/CMakeLists.txt @@ -10,11 +10,9 @@ add_qt_manual_test(tst_network_stresstest tst_network_stresstest.cpp DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network Qt::Test ) diff --git a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt index 30594c8e0b8..9489d0675ef 100644 --- a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt +++ b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_manual_test(qcursorhighdpi SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt index ac9e963905a..ed552bc435d 100644 --- a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt +++ b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt @@ -7,10 +7,8 @@ add_qt_manual_test(qnetconmonitor SOURCES tst_qnetconmonitor.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/manual/qnetconmonitor/CMakeLists.txt b/tests/manual/qnetconmonitor/CMakeLists.txt index 21aee91c1dc..8eda85b783f 100644 --- a/tests/manual/qnetconmonitor/CMakeLists.txt +++ b/tests/manual/qnetconmonitor/CMakeLists.txt @@ -13,10 +13,8 @@ endif() add_qt_manual_test(qnetconmonitor SOURCES tst_qnetconmonitor.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/manual/qnetworkreply/.prev_CMakeLists.txt b/tests/manual/qnetworkreply/.prev_CMakeLists.txt index f291a6aac2a..24854aa64fa 100644 --- a/tests/manual/qnetworkreply/.prev_CMakeLists.txt +++ b/tests/manual/qnetworkreply/.prev_CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_manual_test(tst_manual_qnetworkreply SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/manual/qnetworkreply/CMakeLists.txt b/tests/manual/qnetworkreply/CMakeLists.txt index 9cad41bf58d..5ac12ced951 100644 --- a/tests/manual/qnetworkreply/CMakeLists.txt +++ b/tests/manual/qnetworkreply/CMakeLists.txt @@ -13,11 +13,10 @@ endif() add_qt_manual_test(tst_manual_qnetworkreply SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/manual/qopenglcontext/CMakeLists.txt b/tests/manual/qopenglcontext/CMakeLists.txt index fc5d4e28d4b..9cec06ff1ec 100644 --- a/tests/manual/qopenglcontext/CMakeLists.txt +++ b/tests/manual/qopenglcontext/CMakeLists.txt @@ -9,12 +9,10 @@ add_qt_manual_test(qopenglcontext SOURCES main.cpp qopenglcontextwindow.cpp qopenglcontextwindow.h - LIBRARIES - Qt::EglSupportPrivate - Qt::GuiPrivate PUBLIC_LIBRARIES - Qt::EglSupport + Qt::EglSupportPrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:qopenglcontext.pro:<TRUE>: diff --git a/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt new file mode 100644 index 00000000000..f56583c1e06 --- /dev/null +++ b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qopengltextureblitter.pro. + +##################################################################### +## qopengltextureblitter Binary: +##################################################################### + +add_qt_manual_test(qopengltextureblitter + GUI + SOURCES + main.cpp + qopengltextureblitwindow.cpp qopengltextureblitwindow.h + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +#### Keys ignored in scope 1:.:.:qopengltextureblitter.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qopengltextureblitter/CMakeLists.txt b/tests/manual/qopengltextureblitter/CMakeLists.txt index 2c18c56d360..1fe33049fc9 100644 --- a/tests/manual/qopengltextureblitter/CMakeLists.txt +++ b/tests/manual/qopengltextureblitter/CMakeLists.txt @@ -11,10 +11,9 @@ add_qt_manual_test(qopengltextureblitter qopengltextureblitwindow.cpp qopengltextureblitwindow.h INCLUDE_DIRECTORIES . - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::OpenGL # special case ) diff --git a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt index ddc48339b3c..ffdb8880404 100644 --- a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt +++ b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt @@ -9,13 +9,12 @@ add_qt_manual_test(openglwidget SOURCES main.cpp openglwidget.cpp openglwidget.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) #### Keys ignored in scope 1:.:.:openglwidget.pro:<TRUE>: diff --git a/tests/manual/qprintdevice_dump/CMakeLists.txt b/tests/manual/qprintdevice_dump/CMakeLists.txt index 3725ec062b9..f619024286f 100644 --- a/tests/manual/qprintdevice_dump/CMakeLists.txt +++ b/tests/manual/qprintdevice_dump/CMakeLists.txt @@ -8,11 +8,9 @@ add_qt_manual_test(qprintdevice_dump GUI SOURCES main.cpp - LIBRARIES - Qt::PrintSupportPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::PrintSupport + Qt::PrintSupportPrivate ) #### Keys ignored in scope 1:.:.:qprintdevice_dump.pro:<TRUE>: diff --git a/tests/manual/qt_poll/CMakeLists.txt b/tests/manual/qt_poll/CMakeLists.txt index 5445a7a2ec7..0e19e6a4e32 100644 --- a/tests/manual/qt_poll/CMakeLists.txt +++ b/tests/manual/qt_poll/CMakeLists.txt @@ -10,8 +10,7 @@ add_qt_test(tst_qt_poll tst_qt_poll.cpp INCLUDE_DIRECTORIES ../../../src/corelib/kernel - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network ) diff --git a/tests/manual/qvulkaninstance/CMakeLists.txt b/tests/manual/qvulkaninstance/CMakeLists.txt index 74d0dab5944..2071010da10 100644 --- a/tests/manual/qvulkaninstance/CMakeLists.txt +++ b/tests/manual/qvulkaninstance/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(qvulkaninstance GUI SOURCES main.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:qvulkaninstance.pro:<TRUE>: diff --git a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt index a3754c7d754..5da0ad29329 100644 --- a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt +++ b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(compressedtexture_bc1 GUI SOURCES compressedtexture_bc1.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt index c3c2147eb8f..bd82a5cb0dc 100644 --- a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt +++ b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(compressedtexture_bc1_subupload GUI SOURCES compressedtexture_bc1_subupload.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/computebuffer/CMakeLists.txt b/tests/manual/rhi/computebuffer/CMakeLists.txt index 41d46fcc565..e2a959c1e43 100644 --- a/tests/manual/rhi/computebuffer/CMakeLists.txt +++ b/tests/manual/rhi/computebuffer/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(computebuffer GUI SOURCES computebuffer.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/computeimage/CMakeLists.txt b/tests/manual/rhi/computeimage/CMakeLists.txt index ffb99b8d1c0..a634f1cf987 100644 --- a/tests/manual/rhi/computeimage/CMakeLists.txt +++ b/tests/manual/rhi/computeimage/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(computeimage GUI SOURCES computeimage.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/cubemap/CMakeLists.txt b/tests/manual/rhi/cubemap/CMakeLists.txt index 5886b401380..323ad78170e 100644 --- a/tests/manual/rhi/cubemap/CMakeLists.txt +++ b/tests/manual/rhi/cubemap/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(cubemap GUI SOURCES cubemap.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt index 038209c4480..519d9dc6ec0 100644 --- a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt +++ b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(cubemap_scissor GUI SOURCES cubemap_scissor.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/floattexture/CMakeLists.txt b/tests/manual/rhi/floattexture/CMakeLists.txt index b87ddabab89..3368812524c 100644 --- a/tests/manual/rhi/floattexture/CMakeLists.txt +++ b/tests/manual/rhi/floattexture/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(floattexture GUI SOURCES floattexture.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt index d933d8ae88f..ad2e1dd14ec 100644 --- a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(hellominimalcrossgfxtriangle GUI SOURCES hellominimalcrossgfxtriangle.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/instancing/CMakeLists.txt b/tests/manual/rhi/instancing/CMakeLists.txt index f744daf9004..8c8d0c2a9ac 100644 --- a/tests/manual/rhi/instancing/CMakeLists.txt +++ b/tests/manual/rhi/instancing/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(instancing GUI SOURCES instancing.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/mrt/CMakeLists.txt b/tests/manual/rhi/mrt/CMakeLists.txt index 74fd0261661..db63ebe07d8 100644 --- a/tests/manual/rhi/mrt/CMakeLists.txt +++ b/tests/manual/rhi/mrt/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(mrt GUI SOURCES mrt.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt index 65a0388f805..26aa8798de2 100644 --- a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt +++ b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(msaarenderbuffer GUI SOURCES msaarenderbuffer.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/msaatexture/CMakeLists.txt b/tests/manual/rhi/msaatexture/CMakeLists.txt index 79dc9d61686..5a3c447db4b 100644 --- a/tests/manual/rhi/msaatexture/CMakeLists.txt +++ b/tests/manual/rhi/msaatexture/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(msaatexture GUI SOURCES msaatexture.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/multiwindow/CMakeLists.txt b/tests/manual/rhi/multiwindow/CMakeLists.txt index 67bd6d82bea..a3e63b9d066 100644 --- a/tests/manual/rhi/multiwindow/CMakeLists.txt +++ b/tests/manual/rhi/multiwindow/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(multiwindow GUI SOURCES multiwindow.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt index 39224ef40c0..f3f220dba64 100644 --- a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt +++ b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt @@ -9,10 +9,9 @@ add_qt_manual_test(multiwindow_threaded SOURCES multiwindow_threaded.cpp window.cpp window.h - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/rhi/offscreen/CMakeLists.txt b/tests/manual/rhi/offscreen/CMakeLists.txt index ceefc4c0d67..56a9f2661d9 100644 --- a/tests/manual/rhi/offscreen/CMakeLists.txt +++ b/tests/manual/rhi/offscreen/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_manual_test(offscreen SOURCES offscreen.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/qrhiprof/CMakeLists.txt b/tests/manual/rhi/qrhiprof/CMakeLists.txt index d0a11e94b34..8f4fb3797b6 100644 --- a/tests/manual/rhi/qrhiprof/CMakeLists.txt +++ b/tests/manual/rhi/qrhiprof/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(qrhiprof GUI SOURCES qrhiprof.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Network Qt::Widgets ) diff --git a/tests/manual/rhi/shadowmap/CMakeLists.txt b/tests/manual/rhi/shadowmap/CMakeLists.txt index 2f80d0209d7..d2de92d0941 100644 --- a/tests/manual/rhi/shadowmap/CMakeLists.txt +++ b/tests/manual/rhi/shadowmap/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(shadowmap GUI SOURCES shadowmap.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/texuploads/CMakeLists.txt b/tests/manual/rhi/texuploads/CMakeLists.txt index c2efd3a1ea0..2e97336a9d6 100644 --- a/tests/manual/rhi/texuploads/CMakeLists.txt +++ b/tests/manual/rhi/texuploads/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(texuploads GUI SOURCES texuploads.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/triquadcube/CMakeLists.txt b/tests/manual/rhi/triquadcube/CMakeLists.txt index 584f9aa4c70..42ebf1f55f3 100644 --- a/tests/manual/rhi/triquadcube/CMakeLists.txt +++ b/tests/manual/rhi/triquadcube/CMakeLists.txt @@ -12,10 +12,9 @@ add_qt_manual_test(triquadcube triangleoncuberenderer.cpp triangleoncuberenderer.h trianglerenderer.cpp trianglerenderer.h triquadcube.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/socketengine/.prev_CMakeLists.txt b/tests/manual/socketengine/.prev_CMakeLists.txt index 1540a1f5527..61635f7e776 100644 --- a/tests/manual/socketengine/.prev_CMakeLists.txt +++ b/tests/manual/socketengine/.prev_CMakeLists.txt @@ -7,11 +7,9 @@ add_qt_manual_test(tst_socketengine SOURCES main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network Qt::Test ) diff --git a/tests/manual/socketengine/CMakeLists.txt b/tests/manual/socketengine/CMakeLists.txt index 4ac94fd1802..927955c3dbe 100644 --- a/tests/manual/socketengine/CMakeLists.txt +++ b/tests/manual/socketengine/CMakeLists.txt @@ -13,11 +13,9 @@ endif() add_qt_manual_test(tst_socketengine SOURCES main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network Qt::Test ) diff --git a/tests/manual/textrendering/nativetext/CMakeLists.txt b/tests/manual/textrendering/nativetext/CMakeLists.txt index c7d50f2a6f3..c03a8ed2883 100644 --- a/tests/manual/textrendering/nativetext/CMakeLists.txt +++ b/tests/manual/textrendering/nativetext/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_manual_test(nativetext SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/triangulator/CMakeLists.txt b/tests/manual/triangulator/CMakeLists.txt index 8c6e8eb0211..f3ebfb28a9d 100644 --- a/tests/manual/triangulator/CMakeLists.txt +++ b/tests/manual/triangulator/CMakeLists.txt @@ -9,10 +9,9 @@ add_qt_manual_test(triangulator SOURCES main.cpp triviswidget.cpp triviswidget.h - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt index c9e100714a6..f6b1a2f7eba 100644 --- a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt @@ -8,9 +8,8 @@ add_qt_manual_test(qtreewidget GUI SOURCES main.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Widgets ) diff --git a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt index 046153464b4..b1f8353a4f6 100644 --- a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt +++ b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt @@ -8,9 +8,8 @@ add_qt_manual_test(sizeonhide GUI SOURCES main.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Widgets ) diff --git a/tests/manual/xcb_gl_integration/CMakeLists.txt b/tests/manual/xcb_gl_integration/CMakeLists.txt index ac532a7c617..e92e47fb8a1 100644 --- a/tests/manual/xcb_gl_integration/CMakeLists.txt +++ b/tests/manual/xcb_gl_integration/CMakeLists.txt @@ -10,10 +10,9 @@ add_qt_manual_test(xcb_gl_integration main.cpp INCLUDE_DIRECTORIES . - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:xcb_gl_integration.pro:<TRUE>: |