Regenerate projects one last time before merge

Change-Id: Ia24cf56b79ca6dacd370a7e397024e9b663e0167 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-12 10:24:49 +01:00 · 2020-02-12 10:24:49 +01:00 · 0d177053b9
commit 0d177053b9
parent 36089f5e77
303 changed files with 482 additions and 792 deletions
--- 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
--- 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
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )

--- 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
 )
--- 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
 )
--- 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
 )

--- 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
 )
--- 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}
 )
--- 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}
 )
--- 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
 )

--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )

--- 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}
 )
--- 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
 )

--- 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
 )
--- 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
 )
--- 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}
 )
--- 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
 )

--- 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
 )
--- 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
 )

--- 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
 )

--- 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
 )
--- 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}
 )
--- 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}
 )
--- 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>:
--- 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
 )

--- 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
 )

--- 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
 )

--- 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
 )
--- 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
 )
--- 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
 )

--- 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
 )

--- 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
--- 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
 )

--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )

--- 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
 )

--- 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
 )
--- 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
 )
--- 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:
--- 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:
--- 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
 )
--- 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:
--- 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
 )
--- 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}
 )

--- 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}
 )
--- 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
--- 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
 )
--- 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
 )

--- 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
 )
--- 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:
--- 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
 )

--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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:
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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:
--- 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
 )

--- 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}
 )
--- 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
 )
--- 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:
--- 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:
--- 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}
 )
--- 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:
--- 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
 )
--- 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}
 )

--- 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:
--- 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
 )
--- 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:
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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}
 )
--- 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}
 )
--- 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
 )
--- 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>:
--- 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
 )
--- a/Show More
+++ b/Show More