summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-02-12 10:24:49 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-02-12 17:30:49 +0000
commit0d177053b9406e2fb21802d23f2b2cdc0f974377 (patch)
treed6d805cb44995f88a455e12352064d9c075f0f3b
parent36089f5e7793bd8b15e5b43caf18f856ff2a18b0 (diff)
Regenerate projects one last time before mergewip/cmake
Change-Id: Ia24cf56b79ca6dacd370a7e397024e9b663e0167 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--examples/opengl/hellowindow/CMakeLists.txt7
-rw-r--r--examples/qpa/windows/CMakeLists.txt7
-rw-r--r--tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qglobalstatic/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qhooks/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qnumeric/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/global/qtendian/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qdataurl/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qdir/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qdiriterator/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qfileinfo/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qfilesystementry/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qipaddress/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qloggingcategory/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qloggingregistry/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qsettings/CMakeLists.txt3
-rw-r--r--tests/auto/corelib/io/qstorageinfo/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qtemporarydir/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qurlinternal/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qurlquery/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qeventloop/CMakeLists.txt3
-rw-r--r--tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qmetatype/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt5
-rw-r--r--tests/auto/corelib/kernel/qtimer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qvariant/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/serialization/json/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/text/qstringiterator/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qfuture/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt3
-rw-r--r--tests/auto/corelib/thread/qmutex/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/thread/qresultstore/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/time/qdate/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/time/qdatetime/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/time/qtimezone/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qmakearray/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/tools/qringbuffer/CMakeLists.txt2
-rw-r--r--tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt4
-rw-r--r--tests/auto/dbus/qdbusmetaobject/CMakeLists.txt4
-rw-r--r--tests/auto/dbus/qdbustype/CMakeLists.txt4
-rw-r--r--tests/auto/dbus/qdbusxmlparser/CMakeLists.txt4
-rw-r--r--tests/auto/gui/image/qimage/CMakeLists.txt5
-rw-r--r--tests/auto/gui/image/qimagereader/CMakeLists.txt5
-rw-r--r--tests/auto/gui/image/qpixmap/CMakeLists.txt8
-rw-r--r--tests/auto/gui/image/qpixmapcache/CMakeLists.txt3
-rw-r--r--tests/auto/gui/kernel/noqteventloop/CMakeLists.txt5
-rw-r--r--tests/auto/gui/kernel/qbackingstore/CMakeLists.txt5
-rw-r--r--tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/gui/kernel/qguiapplication/CMakeLists.txt4
-rw-r--r--tests/auto/gui/kernel/qguieventloop/CMakeLists.txt3
-rw-r--r--tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt3
-rw-r--r--tests/auto/gui/kernel/qguitimer/CMakeLists.txt3
-rw-r--r--tests/auto/gui/kernel/qinputmethod/CMakeLists.txt5
-rw-r--r--tests/auto/gui/kernel/qkeysequence/CMakeLists.txt5
-rw-r--r--tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt5
-rw-r--r--tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt5
-rw-r--r--tests/auto/gui/kernel/qscreen/CMakeLists.txt5
-rw-r--r--tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt5
-rw-r--r--tests/auto/gui/kernel/qtouchevent/CMakeLists.txt3
-rw-r--r--tests/auto/gui/kernel/qwindow/CMakeLists.txt5
-rw-r--r--tests/auto/gui/qopengl/CMakeLists.txt5
-rw-r--r--tests/auto/gui/qopenglconfig/CMakeLists.txt5
-rw-r--r--tests/auto/gui/qvulkan/CMakeLists.txt5
-rw-r--r--tests/auto/gui/rhi/qrhi/CMakeLists.txt3
-rw-r--r--tests/auto/gui/rhi/qshader/CMakeLists.txt3
-rw-r--r--tests/auto/gui/text/qcssparser/CMakeLists.txt3
-rw-r--r--tests/auto/gui/text/qfont/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qfontcache/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qfontdatabase/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qfontmetrics/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qinputcontrol/CMakeLists.txt3
-rw-r--r--tests/auto/gui/text/qrawfont/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qstatictext/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextblock/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextcursor/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextdocument/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextformat/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextlayout/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextlist/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextodfwriter/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextpiecetable/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextscriptengine/CMakeLists.txt5
-rw-r--r--tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt3
-rw-r--r--tests/auto/gui/text/qtexttable/CMakeLists.txt3
-rw-r--r--tests/auto/gui/text/qzip/CMakeLists.txt3
-rw-r--r--tests/auto/gui/util/qshadergenerator/CMakeLists.txt3
-rw-r--r--tests/auto/gui/util/qshadergraph/CMakeLists.txt3
-rw-r--r--tests/auto/gui/util/qshadergraphloader/CMakeLists.txt3
-rw-r--r--tests/auto/gui/util/qshadernodes/CMakeLists.txt3
-rw-r--r--tests/auto/gui/util/qshadernodesloader/CMakeLists.txt3
-rw-r--r--tests/auto/gui/util/qtexturefilereader/CMakeLists.txt3
-rw-r--r--tests/auto/network/access/hpack/CMakeLists.txt5
-rw-r--r--tests/auto/network/access/hsts/CMakeLists.txt5
-rw-r--r--tests/auto/network/access/http2/CMakeLists.txt5
-rw-r--r--tests/auto/network/access/qftp/CMakeLists.txt3
-rw-r--r--tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt4
-rw-r--r--tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt4
-rw-r--r--tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt5
-rw-r--r--tests/auto/network/access/qnetworkreply/test/CMakeLists.txt4
-rw-r--r--tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt3
-rw-r--r--tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt3
-rw-r--r--tests/auto/network/kernel/qauthenticator/CMakeLists.txt4
-rw-r--r--tests/auto/network/kernel/qhostaddress/CMakeLists.txt4
-rw-r--r--tests/auto/network/kernel/qhostinfo/CMakeLists.txt4
-rw-r--r--tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/platformsocketengine/CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt4
-rw-r--r--tests/auto/network/ssl/qasn1element/CMakeLists.txt3
-rw-r--r--tests/auto/network/ssl/qdtls/CMakeLists.txt4
-rw-r--r--tests/auto/network/ssl/qdtlscookie/CMakeLists.txt4
-rw-r--r--tests/auto/network/ssl/qocsp/CMakeLists.txt3
-rw-r--r--tests/auto/network/ssl/qsslkey/CMakeLists.txt5
-rw-r--r--tests/auto/network/ssl/qsslsocket/CMakeLists.txt4
-rw-r--r--tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt4
-rw-r--r--tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt4
-rw-r--r--tests/auto/other/lancelot/CMakeLists.txt3
-rw-r--r--tests/auto/other/languagechange/CMakeLists.txt5
-rw-r--r--tests/auto/other/macgui/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/other/macgui/CMakeLists.txt4
-rw-r--r--tests/auto/other/networkselftest/CMakeLists.txt3
-rw-r--r--tests/auto/other/qaccessibility/.prev_CMakeLists.txt10
-rw-r--r--tests/auto/other/qaccessibility/CMakeLists.txt10
-rw-r--r--tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt9
-rw-r--r--tests/auto/other/qaccessibilitylinux/CMakeLists.txt9
-rw-r--r--tests/auto/other/qcomplextext/CMakeLists.txt5
-rw-r--r--tests/auto/other/qfocusevent/CMakeLists.txt3
-rw-r--r--tests/auto/other/toolsupport/CMakeLists.txt2
-rw-r--r--tests/auto/other/xkbkeyboard/CMakeLists.txt4
-rw-r--r--tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt4
-rw-r--r--tests/auto/sql/kernel/qsql/CMakeLists.txt4
-rw-r--r--tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt5
-rw-r--r--tests/auto/sql/kernel/qsqldriver/CMakeLists.txt5
-rw-r--r--tests/auto/sql/kernel/qsqlquery/CMakeLists.txt5
-rw-r--r--tests/auto/sql/kernel/qsqlresult/CMakeLists.txt5
-rw-r--r--tests/auto/sql/kernel/qsqlthread/CMakeLists.txt5
-rw-r--r--tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt5
-rw-r--r--tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt5
-rw-r--r--tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt5
-rw-r--r--tests/auto/sql/models/qsqltablemodel/CMakeLists.txt5
-rw-r--r--tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt3
-rw-r--r--tests/auto/testlib/selftests/badxml/CMakeLists.txt3
-rw-r--r--tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/blacklisted/CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt5
-rw-r--r--tests/auto/testlib/selftests/keyboard/CMakeLists.txt5
-rw-r--r--tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt5
-rw-r--r--tests/auto/testlib/selftests/mouse/CMakeLists.txt5
-rw-r--r--tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/signaldumper/CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/testlib/selftests/silent/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/dialogs/qdialog/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/itemviews/qlistview/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/itemviews/qtableview/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/kernel/qaction/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt7
-rw-r--r--tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/kernel/qformlayout/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/kernel/qlayout/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/kernel/qwidget/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/styles/qmacstyle/CMakeLists.txt4
-rw-r--r--tests/auto/widgets/styles/qstyle/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/util/qcompleter/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/util/qscroller/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/widgets/qcombobox/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qlabel/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qlineedit/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qmenu/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/widgets/qmenubar/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt3
-rw-r--r--tests/auto/widgets/widgets/qtextedit/CMakeLists.txt7
-rw-r--r--tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt5
-rw-r--r--tests/benchmarks/corelib/io/qfile/CMakeLists.txt3
-rw-r--r--tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt3
-rw-r--r--tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt3
-rw-r--r--tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt3
-rw-r--r--tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt3
-rw-r--r--tests/benchmarks/corelib/tools/qstack/CMakeLists.txt3
-rw-r--r--tests/benchmarks/corelib/tools/qvector/CMakeLists.txt3
-rw-r--r--tests/benchmarks/dbus/qdbustype/CMakeLists.txt4
-rw-r--r--tests/benchmarks/gui/image/qpixmap/CMakeLists.txt3
-rw-r--r--tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt3
-rw-r--r--tests/benchmarks/gui/painting/lancebench/CMakeLists.txt3
-rw-r--r--tests/benchmarks/gui/painting/qcolor/CMakeLists.txt3
-rw-r--r--tests/benchmarks/gui/painting/qpainter/CMakeLists.txt5
-rw-r--r--tests/benchmarks/gui/text/qtext/CMakeLists.txt3
-rw-r--r--tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt3
-rw-r--r--tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt5
-rw-r--r--tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt5
-rw-r--r--tests/benchmarks/opengl/CMakeLists.txt7
-rw-r--r--tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt5
-rw-r--r--tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt5
-rw-r--r--tests/manual/cocoa/wheelevent/CMakeLists.txt5
-rw-r--r--tests/manual/embeddedintoforeignwindow/CMakeLists.txt9
-rw-r--r--tests/manual/foreignwindows/CMakeLists.txt9
-rw-r--r--tests/manual/highdpi/CMakeLists.txt3
-rw-r--r--tests/manual/lance/CMakeLists.txt5
-rw-r--r--tests/manual/network_remote_stresstest/CMakeLists.txt5
-rw-r--r--tests/manual/network_stresstest/CMakeLists.txt4
-rw-r--r--tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt5
-rw-r--r--tests/manual/qnetconmonitor/.prev_CMakeLists.txt4
-rw-r--r--tests/manual/qnetconmonitor/CMakeLists.txt4
-rw-r--r--tests/manual/qnetworkreply/.prev_CMakeLists.txt5
-rw-r--r--tests/manual/qnetworkreply/CMakeLists.txt5
-rw-r--r--tests/manual/qopenglcontext/CMakeLists.txt6
-rw-r--r--tests/manual/qopengltextureblitter/.prev_CMakeLists.txt20
-rw-r--r--tests/manual/qopengltextureblitter/CMakeLists.txt3
-rw-r--r--tests/manual/qopenglwidget/openglwidget/CMakeLists.txt7
-rw-r--r--tests/manual/qprintdevice_dump/CMakeLists.txt4
-rw-r--r--tests/manual/qt_poll/CMakeLists.txt3
-rw-r--r--tests/manual/qvulkaninstance/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/computebuffer/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/computeimage/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/cubemap/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/cubemap_scissor/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/floattexture/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/instancing/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/mrt/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/msaarenderbuffer/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/msaatexture/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/multiwindow/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/multiwindow_threaded/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/offscreen/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/qrhiprof/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/shadowmap/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/texuploads/CMakeLists.txt3
-rw-r--r--tests/manual/rhi/triquadcube/CMakeLists.txt3
-rw-r--r--tests/manual/socketengine/.prev_CMakeLists.txt4
-rw-r--r--tests/manual/socketengine/CMakeLists.txt4
-rw-r--r--tests/manual/textrendering/nativetext/CMakeLists.txt5
-rw-r--r--tests/manual/triangulator/CMakeLists.txt3
-rw-r--r--tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt3
-rw-r--r--tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt3
-rw-r--r--tests/manual/xcb_gl_integration/CMakeLists.txt3
303 files changed, 482 insertions, 792 deletions
diff --git a/examples/opengl/hellowindow/CMakeLists.txt b/examples/opengl/hellowindow/CMakeLists.txt
index 95f627be9d..58bd3fc362 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 6f9bbe7534..4eeab0e3bc 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 93e3f43f9b..183127519f 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 1486256a94..7e8eee14d3 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 01b3196bd1..c86faba75f 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 f96e038c3d..8a857c5622 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 23dd440738..edd2efe760 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 80b716f21f..9efb17712e 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 1c1470cf51..1b7a11d657 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 84f1b5b11a..507852a11e 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 6ac1e5b46f..84136283c1 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 dd10eb62c3..2e120b4621 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 03f2e99e37..a6cf3a38f1 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 3643ca6da4..e989315bdd 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 fc89314669..a237090a48 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 9e0817e445..821cd58bdb 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 ea82bc0370..9e1eaf3e4a 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 518258d77b..3c42af9d01 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 77ae908f93..161b03b041 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 c3b14dc6db..08af02dc6c 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 3a106e8453..855495bbbb 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 693e2c674c..af614552cc 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 c941d6811c..5ad3bc1919 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 f35ff284a7..8a0cc54aeb 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 389fd55a9f..ac952f64f7 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 e0e03051b4..888bfeaa78 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 b876807ba9..e7586d580b 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 1cc577fda7..62d517c27d 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 0a84d8bb0a..3c9bb97825 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 5b8acb7a64..cb847dc503 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 320f3a6705..84585751ac 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 102d847d95..dc676d11fe 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 b32b8835d4..dff731cfc2 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 af154db0de..0f287a1652 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 ef966a6424..990835c86a 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 b388bb65cf..454b6c061a 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 509a88da0c..d532eeeb4b 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 8bef975168..c1c0d4b02b 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 92d7210842..b38b6223ed 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 2085df02aa..c9cd01231b 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 c74071957b..e3388ee1b9 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 14b7a73e6f..671eeef665 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 786913cc17..db1afabc0d 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 ef2ef5a7e4..c27412daac 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 5916a33752..536802f127 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 de295bc129..f630bdc43b 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 9a90956bd6..b39828b5df 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 b215ca6efa..e992936e60 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 7d9a8ccc88..d95a2ac767 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 ce7b0d0afb..36b20c3b4f 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 f9eccf72ff..4bab92b0c6 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 090f6e7fb6..fc5f59990f 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 84976ee923..bd615ab900 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 1ffd6944d1..31cf3aff44 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 37ba25e017..34456d6331 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 71b223bdc6..879f8d28e4 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 6951f9a703..865f1124b9 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 93bf709c20..8a96fa18cf 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 32c60e95c3..f6a83aa0da 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 584e77c986..ef73f60ca6 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 7161c47db1..82de116f8d 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 d657196113..639e88fb4c 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 1874a33794..30a6436ece 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 09498e2a39..5bfb10eba9 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 c4daa5a310..de9a876e9d 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 6d0f3cbbee..c4e5117e8c 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 5f255d49e4..2be3339fe3 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 f0f09818e5..2eee15b816 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 01f03fac76..07e480c9dd 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 c8e3789886..4176be9840 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 61e1be44fd..9b586ce4c8 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 2e2a04f969..dd54db4753 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 148ab2be8d..d12e1da106 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 2a74918f8a..7d489e3066 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 c5a56a5a06..cfd17219bd 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 30c1ec94b3..1c7c9b6ec0 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 bcac684cf9..26ce58d98c 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 ad8a9f9e67..6316aa8f68 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 27c8a731e7..8c3026c176 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 9d9352ef1e..472fc3b7e4 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 869eebbf95..09e1672bc4 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 1f063ab8b2..a04f8365b1 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 dc5e76c91d..84f6373328 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 32affde1ca..65c6224a00 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 10ba5dd791..029f5d5ce3 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 8c379bffc3..e544fb313c 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 41093ee603..5044866c49 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 c2b53e731c..80eef2f254 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 ca461a37d5..18e0be18c6 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 2e129d0262..78b6ed191d 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 5ac40ee8b6..7ea22d3fb0 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 09469b7c7f..f92a82a262 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 5635141476..be7653abd4 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 b43c009b99..c87d5bdd4d 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 80e4623ce5..f22de38a8c 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 4e1f54a117..6a1043c89f 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 c7695bff97..7360b40994 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 f21648cfc7..18c84e5a45 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 a1caa47e4e..5fb8db5405 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 1a3b8cfa92..8d94e33b6c 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 bdda60149c..b2434569d4 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 219a868953..de82c94233 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 034e52e1fd..dfeb968cc1 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 a12cabbf84..e9cb62377f 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 0e5eef8dd5..ede24f2a40 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 683df0029f..caf863d42d 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 e70c36e8f8..d7cc14b09c 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 226eac25a3..e381af4f7b 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 abb48884d3..3b6d99c0e8 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 531246ecf0..e1c5c1a469 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 f2d09a6395..804ebedf61 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 082da570e7..51c7c18eac 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 4c706febdd..9887e1eea6 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 b1b2059952..6ab8876c82 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 c381ec7b3b..8c68a18da6 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 a9296cf3f0..929388a10a 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 97d0da3d34..48759572de 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 0df7ce71da..e164bccbdf 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 cbc6348d4d..c86966600d 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 80d6667a21..f461591884 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 51de80402f..f967625d38 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 60077d0021..19eae0611d 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 3fd139b93e..ecacd338ab 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 bb681d9e2f..1dece78966 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 8dfa61c5ac..6aeec0a983 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 41a958a36e..fd58b931e6 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 238c6b9931..61b8d25736 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 9523830a15..57fafe7a04 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 70738d6525..aa9ff58012 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 ce0f029f05..77bf65f199 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 1df4de743d..827716c3b7 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 4bace58e44..399711f9a0 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 8b16325559..04634d1997 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 601165d55d..99ec2ad823 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 b3d8626da9..c377e0a46a 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 b71d0a4f8b..f3a3178879 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 f06586d3d4..6f15ff7990 100644
--- a/tests/auto/other/lancelot/CMakeLists.txt
+++ b/tests/auto/other/lancelot/CMakeLists.txt
@@ -21,10 +21,9 @@ add_qt_test(tst_lancelot
QMAKESPEC=\\\"\\\"
INCLUDE_DIRECTORIES
../../../baselineserver/shared
- LIBRARIES
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Network
TESTDATA ${test_data}
)
diff --git a/tests/auto/other/languagechange/CMakeLists.txt b/tests/auto/other/languagechange/CMakeLists.txt
index d93808848b..f5c43b0ed1 100644
--- a/tests/auto/other/languagechange/CMakeLists.txt
+++ b/tests/auto/other/languagechange/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_languagechange
SOURCES
tst_languagechange.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
)
diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt
index 316d8f7232..4923568a89 100644
--- a/tests/auto/other/macgui/.prev_CMakeLists.txt
+++ b/tests/auto/other/macgui/.prev_CMakeLists.txt
@@ -15,11 +15,9 @@ add_qt_test(tst_macgui
SOURCES
guitest.cpp guitest.h
tst_macgui.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Widgets
)
#### Keys ignored in scope 1:.:.:macgui.pro:<TRUE>:
diff --git a/tests/auto/other/macgui/CMakeLists.txt b/tests/auto/other/macgui/CMakeLists.txt
index 898abf16f4..de69c43765 100644
--- a/tests/auto/other/macgui/CMakeLists.txt
+++ b/tests/auto/other/macgui/CMakeLists.txt
@@ -15,11 +15,9 @@ add_qt_test(tst_macgui
SOURCES
guitest.cpp guitest.h
tst_macgui.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Widgets
)
#### Keys ignored in scope 1:.:.:macgui.pro:<TRUE>:
diff --git a/tests/auto/other/networkselftest/CMakeLists.txt b/tests/auto/other/networkselftest/CMakeLists.txt
index 49a5664ded..7765557248 100644
--- a/tests/auto/other/networkselftest/CMakeLists.txt
+++ b/tests/auto/other/networkselftest/CMakeLists.txt
@@ -7,8 +7,7 @@
add_qt_test(tst_networkselftest
SOURCES
tst_networkselftest.cpp
- LIBRARIES
- Qt::CorePrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Network
)
diff --git a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
index 85d938e100..8663e412c4 100644
--- a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
@@ -12,14 +12,12 @@ add_qt_test(tst_qaccessibility
SOURCES
accessiblewidgets.h
tst_qaccessibility.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
- Qt::Widgets
)
#### Keys ignored in scope 1:.:.:qaccessibility.pro:<TRUE>:
@@ -42,8 +40,6 @@ extend_target(tst_qaccessibility CONDITION WIN32
)
extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT
- LIBRARIES
- Qt::WindowsUIAutomationSupportPrivate
PUBLIC_LIBRARIES
- Qt::WindowsUIAutomationSupport
+ Qt::WindowsUIAutomationSupportPrivate
)
diff --git a/tests/auto/other/qaccessibility/CMakeLists.txt b/tests/auto/other/qaccessibility/CMakeLists.txt
index 0b98cae5f9..f5f74bbafc 100644
--- a/tests/auto/other/qaccessibility/CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/CMakeLists.txt
@@ -18,14 +18,12 @@ add_qt_test(tst_qaccessibility
SOURCES
accessiblewidgets.h
tst_qaccessibility.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
- Qt::Widgets
)
#### Keys ignored in scope 1:.:.:qaccessibility.pro:<TRUE>:
@@ -48,8 +46,6 @@ extend_target(tst_qaccessibility CONDITION WIN32
)
extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT
- LIBRARIES
- Qt::WindowsUIAutomationSupportPrivate
PUBLIC_LIBRARIES
- Qt::WindowsUIAutomationSupport
+ Qt::WindowsUIAutomationSupportPrivate
)
diff --git a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
index adfb7e5a83..7111e9cf57 100644
--- a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
+++ b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
@@ -9,14 +9,11 @@ add_qt_test(tst_qaccessibilitylinux
tst_qaccessibilitylinux.cpp
DBUS_INTERFACE_SOURCES
../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml
- LIBRARIES
- Qt::AccessibilitySupportPrivate
- Qt::GuiPrivate
- Qt::LinuxAccessibilitySupportPrivate
PUBLIC_LIBRARIES
- Qt::AccessibilitySupport
+ Qt::AccessibilitySupportPrivate
Qt::DBus
Qt::Gui
- Qt::LinuxAccessibilitySupport
+ Qt::GuiPrivate
+ Qt::LinuxAccessibilitySupportPrivate
Qt::Widgets
)
diff --git a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
index 905e68edc4..ae6e7c4205 100644
--- a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
+++ b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
@@ -15,15 +15,12 @@ add_qt_test(tst_qaccessibilitylinux
tst_qaccessibilitylinux.cpp
DBUS_INTERFACE_SOURCES
../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml
- LIBRARIES
- Qt::AccessibilitySupportPrivate
- Qt::GuiPrivate
- Qt::LinuxAccessibilitySupportPrivate
PUBLIC_LIBRARIES
- Qt::AccessibilitySupport
+ Qt::AccessibilitySupportPrivate
Qt::DBus
Qt::Gui
- Qt::LinuxAccessibilitySupport
+ Qt::GuiPrivate
+ Qt::LinuxAccessibilitySupportPrivate
Qt::Widgets
)
diff --git a/tests/auto/other/qcomplextext/CMakeLists.txt b/tests/auto/other/qcomplextext/CMakeLists.txt
index 883fabe01a..ee504faaf7 100644
--- a/tests/auto/other/qcomplextext/CMakeLists.txt
+++ b/tests/auto/other/qcomplextext/CMakeLists.txt
@@ -10,11 +10,10 @@ list(APPEND test_data "data")
add_qt_test(tst_qcomplextext
SOURCES
tst_qcomplextext.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
TESTDATA ${test_data}
)
diff --git a/tests/auto/other/qfocusevent/CMakeLists.txt b/tests/auto/other/qfocusevent/CMakeLists.txt
index 044b176555..a2406c034a 100644
--- a/tests/auto/other/qfocusevent/CMakeLists.txt
+++ b/tests/auto/other/qfocusevent/CMakeLists.txt
@@ -7,9 +7,8 @@
add_qt_test(tst_qfocusevent
SOURCES
tst_qfocusevent.cpp
- LIBRARIES
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
)
diff --git a/tests/auto/other/toolsupport/CMakeLists.txt b/tests/auto/other/toolsupport/CMakeLists.txt
index ee170b3a77..51af17d866 100644
--- a/tests/auto/other/toolsupport/CMakeLists.txt
+++ b/tests/auto/other/toolsupport/CMakeLists.txt
@@ -7,6 +7,6 @@
add_qt_test(tst_toolsupport
SOURCES
tst_toolsupport.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
)
diff --git a/tests/auto/other/xkbkeyboard/CMakeLists.txt b/tests/auto/other/xkbkeyboard/CMakeLists.txt
index fbbe5c67bb..93a02eea12 100644
--- a/tests/auto/other/xkbkeyboard/CMakeLists.txt
+++ b/tests/auto/other/xkbkeyboard/CMakeLists.txt
@@ -7,9 +7,7 @@
add_qt_test(tst_xkbkeyboard
SOURCES
tst_xkbkeyboard.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
)
diff --git a/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt b/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt
index 60a6016328..1ddb49d8e9 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 88c2d9ee3c..c3c3eac7d2 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 ad0cefa460..ae64269c11 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 a59ee08ea7..30ce3c1053 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 dd7703b401..a5d3c96baa 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 91762a0f6c..c150c8a9d7 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 793e8c7fd5..17e66f42dd 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 1c8a2372b6..f2da569f8f 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 979d3a4f43..caadae1df5 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 2dea59b79d..f695a6173e 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 a251847181..f3e703591f 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 7840ba51ba..755cbecd2e 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 c26edd4d08..40870b1983 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 285f614f4a..3789558508 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 9aba4104ac..1edf2826ad 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 322b85fd08..d1eae1a783 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 a828d628ba..8136abe3ab 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 e45839faee..86c58467bf 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 4b98a88253..2766c1a36c 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 0ba47c3b97..4308195d73 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 441569bd91..9f6b364cec 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 d7c26b804d..e5989ba69e 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 b431875722..0376ffacd1 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 ec645eee97..ebe7d6e299 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 f02e38b75d..23916b81e0 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 13201d2384..2c003f6fb6 100644
--- a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qdialog
SOURCES
tst_qdialog.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt
index 745e65b332..7b6d004776 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt
@@ -9,11 +9,10 @@ add_qt_test(tst_qfiledialog
tst_qfiledialog.cpp
DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt
index 4989c312c9..2fb610a784 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt
@@ -9,11 +9,10 @@ add_qt_test(tst_qfiledialog2
tst_qfiledialog2.cpp
DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
index c4baa3fc12..38c0547390 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
@@ -10,12 +10,11 @@ add_qt_test(tst_qfilesystemmodel
tst_qfilesystemmodel.cpp
INCLUDE_DIRECTORIES
../../../../shared
- LIBRARIES
- Qt::CorePrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
## Scopes:
diff --git a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
index 345822ac79..af858c8946 100644
--- a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
@@ -7,13 +7,12 @@
add_qt_test(tst_qfontdialog
SOURCES
tst_qfontdialog.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
# Resources:
diff --git a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt
index b9d9ef04a1..7cd02a04c0 100644
--- a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt
@@ -7,9 +7,7 @@
add_qt_test(tst_qinputdialog
SOURCES
tst_qinputdialog.cpp
- LIBRARIES
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
- Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt
index 882cc143e1..ae12c58ca2 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qmessagebox
SOURCES
tst_qmessagebox.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt
index bc7d9f26ed..d1e2a6686c 100644
--- a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qsidebar
SOURCES
tst_qsidebar.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt
index b6cd4fa934..4cdeb6b4e5 100644
--- a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt
+++ b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qgraphicseffect
SOURCES
tst_qgraphicseffect.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt
index 31dbe56907..6ffd2c4029 100644
--- a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt
+++ b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qpixmapfilter
SOURCES
tst_qpixmapfilter.cpp
- LIBRARIES
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt
index 6c213bc209..db323fcb15 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qgraphicsanchorlayout
SOURCES
tst_qgraphicsanchorlayout.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt
index a6739093b4..9d9fc68832 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qgraphicsanchorlayout1
SOURCES
tst_qgraphicsanchorlayout1.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt
index 6becd124bf..ac1ac91f8b 100644
--- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qgraphicseffectsource
SOURCES
tst_qgraphicseffectsource.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt
index b500ec487a..1be66372b6 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt
@@ -9,14 +9,13 @@ add_qt_test(tst_qgraphicsitem
tst_qgraphicsitem.cpp
DEFINES
QT_NO_CAST_TO_ASCII
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
## Scopes:
diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt
index 6fd8273708..0e29191792 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt
@@ -7,9 +7,8 @@
add_qt_test(tst_qgraphicsobject
SOURCES
tst_qgraphicsobject.cpp
- LIBRARIES
- Qt::CorePrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
Qt::Widgets
)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt
index 77af1c5a83..accec5ff40 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt
@@ -9,11 +9,10 @@ add_qt_test(tst_qgraphicsproxywidget
tst_qgraphicsproxywidget.cpp
DEFINES
QTEST_QPA_MOUSE_HANDLING
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
index ddc377799f..c566b6c1bf 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
@@ -10,13 +10,12 @@ add_qt_test(tst_qgraphicsscene
DEFINES
QT_NO_CAST_TO_ASCII
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
# Resources:
diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt
index b8a5fcd905..5fa72f7b46 100644
--- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt
@@ -11,13 +11,12 @@ endif()
add_qt_test(tst_qgraphicssceneindex
SOURCES
tst_qgraphicssceneindex.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
#### Keys ignored in scope 1:.:.:qgraphicssceneindex.pro:<TRUE>:
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
index 191cc9a9c0..17c9571d62 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
@@ -10,14 +10,13 @@ add_qt_test(tst_qgraphicsview
tst_qgraphicsview_2.cpp
DEFINES
QT_NO_CAST_TO_ASCII
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
#### Keys ignored in scope 1:.:.:qgraphicsview.pro:<TRUE>:
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt
index 9c49a957c0..7325f7eb21 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qgraphicswidget
SOURCES
tst_qgraphicswidget.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
index 02c52ed42d..520a0b4b98 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qabstractitemview
SOURCES
tst_qabstractitemview.cpp
- LIBRARIES
- Qt::GuiPrivate
- Qt::TestPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
+ Qt::TestPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
index 47e6a1ee35..d33e3b9c2e 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
@@ -8,12 +8,11 @@ add_qt_test(tst_qcolumnview
SOURCES
../../../../shared/fakedirmodel.h
tst_qcolumnview.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
index 8a4cebe7d5..8949ac4957 100644
--- a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
@@ -9,11 +9,10 @@ add_qt_test(tst_qheaderview
tst_qheaderview.cpp
DEFINES
QT_DISABLE_DEPRECATED_BEFORE=0
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
index f97940b28a..af1bac9ff0 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qitemdelegate
SOURCES
tst_qitemdelegate.cpp
- LIBRARIES
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
## Scopes:
diff --git a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
index 1c7c5ae7fe..07c290128e 100644
--- a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
@@ -7,14 +7,13 @@
add_qt_test(tst_qlistview
SOURCES
tst_qlistview.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
## Scopes:
diff --git a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
index 853b463893..aebcb4c49e 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qlistwidget
SOURCES
tst_qlistwidget.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
index 0906f4c5a1..20e50d2de3 100644
--- a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
@@ -7,12 +7,11 @@
add_qt_test(tst_qtableview
SOURCES
tst_qtableview.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
index 4914f705ab..40a6a1a6d6 100644
--- a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
@@ -8,12 +8,11 @@ add_qt_test(tst_qtreeview
SOURCES
../../../../shared/fakedirmodel.h
tst_qtreeview.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/kernel/qaction/CMakeLists.txt b/tests/auto/widgets/kernel/qaction/CMakeLists.txt
index 67f98382f1..469cc4d597 100644
--- a/tests/auto/widgets/kernel/qaction/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qaction/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qaction
SOURCES
tst_qaction.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt
index af5138c756..40e612f0de 100644
--- a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt
@@ -12,13 +12,12 @@ list(APPEND test_data "../modal")
add_qt_test(test
SOURCES
../tst_qapplication.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
TESTDATA ${test_data}
)
diff --git a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt
index bc2ef1000f..171ee1b273 100644
--- a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt
@@ -12,13 +12,12 @@ list(APPEND test_data "../modal")
add_qt_test(tst_qapplication # special case
SOURCES
../tst_qapplication.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
TESTDATA ${test_data}
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case
)
diff --git a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt
index dca063e2f0..901d20f1e3 100644
--- a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt
@@ -7,9 +7,8 @@
add_qt_test(tst_qboxlayout
SOURCES
tst_qboxlayout.cpp
- LIBRARIES
- Qt::TestPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::TestPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt
index 48e1431a35..f786f3331c 100644
--- a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qformlayout
SOURCES
tst_qformlayout.cpp
- LIBRARIES
- Qt::TestPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::TestPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt
index 7041320dd0..61bf8d303a 100644
--- a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qgesturerecognizer
SOURCES
tst_qgesturerecognizer.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt
index 86661e505a..79995454f7 100644
--- a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt
@@ -8,14 +8,13 @@ add_qt_test(tst_qgridlayout
SOURCES
sortdialog.ui
tst_qgridlayout.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
ENABLE_AUTOGEN_TOOLS
uic
)
diff --git a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt
index 2a3526722e..e63a80117f 100644
--- a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt
@@ -13,12 +13,11 @@ list(APPEND test_data ${test_data_glob})
add_qt_test(tst_qlayout
SOURCES
tst_qlayout.cpp
- LIBRARIES
- Qt::TestPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::TestPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
TESTDATA ${test_data}
)
diff --git a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt
index 440421a3ea..582f0d582d 100644
--- a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qsizepolicy
SOURCES
tst_qsizepolicy.cpp
- LIBRARIES
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
## Scopes:
diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
index df2056476b..849dfea52a 100644
--- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
@@ -7,14 +7,13 @@
add_qt_test(tst_qwidget
SOURCES
tst_qwidget.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
# Resources:
diff --git a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt
index c3fc672c17..201c271103 100644
--- a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qwidget_window
SOURCES
tst_qwidget_window.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
)
diff --git a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt
index 887ecda4af..06a4156b57 100644
--- a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt
@@ -7,9 +7,8 @@
add_qt_test(tst_qwidgetaction
SOURCES
tst_qwidgetaction.cpp
- LIBRARIES
- Qt::TestPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::TestPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt b/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt
index 59d33b9589..44053dbe3d 100644
--- a/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt
+++ b/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt
@@ -7,9 +7,7 @@
add_qt_test(tst_qmacstyle
SOURCES
tst_qmacstyle.cpp
- LIBRARIES
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
- Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/styles/qstyle/CMakeLists.txt b/tests/auto/widgets/styles/qstyle/CMakeLists.txt
index 1400c94633..21d81113f4 100644
--- a/tests/auto/widgets/styles/qstyle/CMakeLists.txt
+++ b/tests/auto/widgets/styles/qstyle/CMakeLists.txt
@@ -7,9 +7,8 @@
add_qt_test(tst_qstyle
SOURCES
tst_qstyle.cpp
- LIBRARIES
- Qt::TestPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::TestPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt b/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt
index ca1a2ee062..01c4df38fe 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt
+++ b/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt
@@ -11,13 +11,12 @@ endif()
add_qt_test(tst_qstylesheetstyle
SOURCES
tst_qstylesheetstyle.cpp
- LIBRARIES
- Qt::GuiPrivate
- Qt::TestPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
+ Qt::TestPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
# Resources:
diff --git a/tests/auto/widgets/util/qcompleter/CMakeLists.txt b/tests/auto/widgets/util/qcompleter/CMakeLists.txt
index ffc47a8319..fb87c3beec 100644
--- a/tests/auto/widgets/util/qcompleter/CMakeLists.txt
+++ b/tests/auto/widgets/util/qcompleter/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qcompleter
SOURCES
tst_qcompleter.cpp
- LIBRARIES
- Qt::TestPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::TestPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/util/qscroller/CMakeLists.txt b/tests/auto/widgets/util/qscroller/CMakeLists.txt
index 2a1e0dc427..b6c6efcc2f 100644
--- a/tests/auto/widgets/util/qscroller/CMakeLists.txt
+++ b/tests/auto/widgets/util/qscroller/CMakeLists.txt
@@ -7,9 +7,8 @@
add_qt_test(tst_qscroller
SOURCES
tst_qscroller.cpp
- LIBRARIES
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
index c00064446b..48a174b6e1 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
@@ -7,9 +7,8 @@
add_qt_test(tst_qabstractbutton
SOURCES
tst_qabstractbutton.cpp
- LIBRARIES
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
index 275f80db95..0dbbf63239 100644
--- a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
@@ -7,9 +7,8 @@
add_qt_test(tst_qabstractslider
SOURCES
tst_qabstractslider.cpp
- LIBRARIES
- Qt::TestPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::TestPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
index ecfe26fb5c..32c814c535 100644
--- a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qabstractspinbox
SOURCES
tst_qabstractspinbox.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
)
diff --git a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
index ba12840211..95fbe14eec 100644
--- a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
@@ -13,13 +13,12 @@ add_qt_test(tst_qcombobox
tst_qcombobox.cpp
DEFINES
QTEST_QPA_MOUSE_HANDLING
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
TESTDATA ${test_data}
)
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
index 9d9f641f92..8eb294d361 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qdatetimeedit
SOURCES
tst_qdatetimeedit.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
index 415498c649..e2b6cc5942 100644
--- a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qdockwidget
SOURCES
tst_qdockwidget.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
index 3d6d055fed..a4fe508a02 100644
--- a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
@@ -17,12 +17,11 @@ list(APPEND test_data ${test_data_glob})
add_qt_test(tst_qlabel
SOURCES
tst_qlabel.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
TESTDATA ${test_data}
)
diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
index 6e9d80ee66..f95094aa7d 100644
--- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
@@ -7,14 +7,13 @@
add_qt_test(tst_qlineedit
SOURCES
tst_qlineedit.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
+ Qt::Gui
Qt::GuiPrivate
Qt::TestPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
## Scopes:
diff --git a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
index 292ab5aeb1..55bcf941d0 100644
--- a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
@@ -7,9 +7,8 @@
add_qt_test(tst_qmainwindow
SOURCES
tst_qmainwindow.cpp
- LIBRARIES
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
index d796baf93d..961bd09492 100644
--- a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
@@ -12,10 +12,9 @@ add_qt_test(tst_qmdiarea
QT_NO_CAST_TO_ASCII
INCLUDE_DIRECTORIES
.
- LIBRARIES
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
index 9844b9192f..791d411970 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
@@ -12,9 +12,8 @@ add_qt_test(tst_qmdisubwindow
QT_NO_CAST_TO_ASCII
INCLUDE_DIRECTORIES
.
- LIBRARIES
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
index 4c1863d9ef..a20fe70492 100644
--- a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
@@ -7,11 +7,10 @@
add_qt_test(tst_qmenu
SOURCES
tst_qmenu.cpp
- LIBRARIES
- Qt::GuiPrivate
- Qt::TestPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
+ Qt::TestPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
index cc1ce337ea..43875cd113 100644
--- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qmenubar
SOURCES
tst_qmenubar.cpp
- LIBRARIES
- Qt::TestPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::TestPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
index 1f5bb2dff8..d9e447d38b 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
@@ -7,12 +7,11 @@
add_qt_test(tst_qopenglwidget
SOURCES
tst_qopenglwidget.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::OpenGLPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::OpenGL
+ Qt::OpenGLPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
index 0774967c8c..4106de04de 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
@@ -9,12 +9,11 @@ add_qt_test(tst_qplaintextedit
tst_qplaintextedit.cpp
INCLUDE_DIRECTORIES
..
- LIBRARIES
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
## Scopes:
diff --git a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
index 92b8049ef6..83d091755f 100644
--- a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
@@ -7,9 +7,8 @@
add_qt_test(tst_qscrollbar
SOURCES
tst_qscrollbar.cpp
- LIBRARIES
- Qt::TestPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::TestPrivate
Qt::Widgets
)
diff --git a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
index 5cf53d1be5..9bd0018082 100644
--- a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
@@ -9,11 +9,10 @@ add_qt_test(tst_qtabwidget
tst_qtabwidget.cpp
INCLUDE_DIRECTORIES
..
- LIBRARIES
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
Qt::Widgets
+ Qt::WidgetsPrivate
)
## Scopes:
diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
index db077d6354..61641707b9 100644
--- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
@@ -10,13 +10,12 @@ list(APPEND test_data "fullWidthSelection")
add_qt_test(tst_qtextedit
SOURCES
tst_qtextedit.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
TESTDATA ${test_data}
)
diff --git a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
index 43803ccdff..d3aef03fa1 100644
--- a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
@@ -7,10 +7,9 @@
add_qt_test(tst_qtoolbar
SOURCES
tst_qtoolbar.cpp
- LIBRARIES
- Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
+ Qt::WidgetsPrivate
)
diff --git a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt
index f69f7cfca7..7d1e19d75a 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 f0c93f3b55..195419f52e 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 90a9960f68..00bbe74c2d 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 c85020606a..d582dba8db 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 dade4273fa..e0323b90db 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 75ac16cad6..530d55b19b 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 19575872bc..0cc9b24236 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 1b663ac19f..fb250f9f00 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 2798fe4dbb..e75703f33d 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 b108753c93..add15f25fb 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 a4c673af9b..677a3d98d4 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 2e365678e9..d5367704ae 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 926af40a2e..a4e3242409 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 a6d4952eba..b2380c8316 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 1b956b459b..eb1f633d9b 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 19c62103d8..c77f7b56f8 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 5133fdc608..f234b5d7a4 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 070916cc9b..bbee072587 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 ed0ae90461..95e3aca221 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 ea9acba088..b55d46984f 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 b3c1a10226..305036fa78 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 a40a655f4d..02c0893cde 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 707d7e7056..8a7f525198 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 b1983ff00a..dee2d1ae43 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 bf4021f60f..ea7be24e76 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 4293925a8f..46db952b46 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 a8ba9e29b6..310c62dae8 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 30594c8e0b..9489d0675e 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 ac9e963905..ed552bc435 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 21aee91c1d..8eda85b783 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 f291a6aac2..24854aa64f 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 9cad41bf58..5ac12ced95 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 fc5d4e28d4..9cec06ff1e 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 0000000000..f56583c1e0
--- /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 2c18c56d36..1fe33049fc 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 ddc48339b3..ffdb888040 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 3725ec062b..f619024286 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 5445a7a2ec..0e19e6a4e3 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 74d0dab594..2071010da1 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 a3754c7d75..5da0ad2932 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 c3c2147eb8..bd82a5cb0d 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 41d46fcc56..e2a959c1e4 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 ffb99b8d1c..a634f1cf98 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 5886b40138..323ad78170 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 038209c448..519d9dc6ec 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 b87ddabab8..3368812524 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 d933d8ae88..ad2e1dd14e 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 f744daf900..8c8d0c2a9a 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 74fd026166..db63ebe07d 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 65a0388f80..26aa8798de 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 79dc9d6168..5a3c447db4 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 67bd6d82be..a3e63b9d06 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 39224ef40c..f3f220dba6 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 ceefc4c0d6..56a9f2661d 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 d0a11e94b3..8f4fb3797b 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 2f80d0209d..d2de92d094 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 c2efd3a1ea..2e97336a9d 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 584f9aa4c7..42ebf1f55f 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 1540a1f552..61635f7e77 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 4ac94fd180..927955c3db 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 c7d50f2a6f..c03a8ed288 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 8c6e8eb021..f3ebfb28a9 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 c9e100714a..f6b1a2f7eb 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 046153464b..b1f8353a4f 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 ac532a7c61..e92e47fb8a 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>: