From bec264c15fe07382009def3c4bbef3f3b689b6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 14 Nov 2022 14:49:32 +0100 Subject: Examples: Use Qt6:: to qualify Qt CMake packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is what we promote also in the documentation. Change-Id: If91aebafe861b0c934acbb2c69afd182abc3345d Reviewed-by: Jörg Bornemann --- examples/CMakeLists.txt | 20 ++++++++++---------- .../bindablesubscription/CMakeLists.txt | 6 +++--- .../bindableproperties/subscription/CMakeLists.txt | 6 +++--- examples/corelib/ipc/CMakeLists.txt | 4 ++-- .../corelib/ipc/localfortuneclient/CMakeLists.txt | 8 ++++---- .../corelib/ipc/localfortuneserver/CMakeLists.txt | 8 ++++---- examples/corelib/ipc/sharedmemory/CMakeLists.txt | 6 +++--- examples/corelib/mimetypes/CMakeLists.txt | 2 +- .../corelib/mimetypes/mimetypebrowser/CMakeLists.txt | 6 +++--- examples/corelib/permissions/CMakeLists.txt | 6 +++--- .../corelib/serialization/cbordump/CMakeLists.txt | 2 +- .../corelib/serialization/convert/CMakeLists.txt | 2 +- .../corelib/serialization/savegame/CMakeLists.txt | 2 +- examples/corelib/threads/CMakeLists.txt | 2 +- examples/corelib/threads/mandelbrot/CMakeLists.txt | 6 +++--- .../corelib/threads/queuedcustomtype/CMakeLists.txt | 6 +++--- examples/corelib/threads/semaphores/CMakeLists.txt | 2 +- .../corelib/threads/waitconditions/CMakeLists.txt | 2 +- examples/corelib/tools/CMakeLists.txt | 2 +- .../corelib/tools/contiguouscache/CMakeLists.txt | 6 +++--- examples/corelib/tools/customtype/CMakeLists.txt | 6 +++--- .../corelib/tools/customtypesending/CMakeLists.txt | 6 +++--- examples/dbus/CMakeLists.txt | 4 ++-- examples/dbus/chat/CMakeLists.txt | 8 ++++---- examples/dbus/listnames/CMakeLists.txt | 4 ++-- examples/dbus/remotecontrolledcar/car/CMakeLists.txt | 8 ++++---- .../remotecontrolledcar/controller/CMakeLists.txt | 8 ++++---- examples/embedded/CMakeLists.txt | 2 +- examples/embedded/digiflip/CMakeLists.txt | 6 +++--- examples/embedded/flickable/CMakeLists.txt | 6 +++--- examples/embedded/flightinfo/CMakeLists.txt | 8 ++++---- examples/embedded/lightmaps/CMakeLists.txt | 8 ++++---- examples/embedded/raycasting/CMakeLists.txt | 6 +++--- examples/embedded/styleexample/CMakeLists.txt | 6 +++--- examples/gui/CMakeLists.txt | 2 +- examples/gui/analogclock/CMakeLists.txt | 4 ++-- examples/gui/rasterwindow/CMakeLists.txt | 4 ++-- examples/network/CMakeLists.txt | 12 ++++++------ .../network/blockingfortuneclient/CMakeLists.txt | 8 ++++---- examples/network/broadcastreceiver/CMakeLists.txt | 8 ++++---- examples/network/broadcastsender/CMakeLists.txt | 8 ++++---- examples/network/dnslookup/CMakeLists.txt | 4 ++-- examples/network/download/CMakeLists.txt | 4 ++-- examples/network/downloadmanager/CMakeLists.txt | 4 ++-- examples/network/fortuneclient/CMakeLists.txt | 8 ++++---- examples/network/fortuneserver/CMakeLists.txt | 8 ++++---- examples/network/googlesuggest/CMakeLists.txt | 8 ++++---- examples/network/http/CMakeLists.txt | 8 ++++---- examples/network/loopback/CMakeLists.txt | 8 ++++---- examples/network/multicastreceiver/CMakeLists.txt | 8 ++++---- examples/network/multicastsender/CMakeLists.txt | 8 ++++---- examples/network/multistreamclient/CMakeLists.txt | 8 ++++---- examples/network/multistreamserver/CMakeLists.txt | 8 ++++---- examples/network/network-chat/CMakeLists.txt | 8 ++++---- examples/network/securesocketclient/CMakeLists.txt | 8 ++++---- examples/network/secureudpclient/CMakeLists.txt | 8 ++++---- examples/network/secureudpserver/CMakeLists.txt | 8 ++++---- .../network/threadedfortuneserver/CMakeLists.txt | 8 ++++---- examples/network/torrent/CMakeLists.txt | 8 ++++---- examples/opengl/2dpainting/CMakeLists.txt | 10 +++++----- examples/opengl/CMakeLists.txt | 2 +- examples/opengl/computegles31/CMakeLists.txt | 6 +++--- examples/opengl/contextinfo/CMakeLists.txt | 8 ++++---- examples/opengl/cube/CMakeLists.txt | 10 +++++----- examples/opengl/hellogl2/CMakeLists.txt | 10 +++++----- examples/opengl/hellogles3/CMakeLists.txt | 6 +++--- examples/opengl/hellowindow/CMakeLists.txt | 10 +++++----- examples/opengl/openglwindow/CMakeLists.txt | 6 +++--- examples/opengl/paintedwindow/CMakeLists.txt | 6 +++--- examples/opengl/qopenglwidget/CMakeLists.txt | 10 +++++----- examples/opengl/qopenglwindow/CMakeLists.txt | 6 +++--- examples/opengl/textures/CMakeLists.txt | 10 +++++----- examples/opengl/threadedqopenglwidget/CMakeLists.txt | 10 +++++----- examples/qpa/CMakeLists.txt | 2 +- examples/qpa/qrasterwindow/CMakeLists.txt | 4 ++-- examples/qpa/windows/CMakeLists.txt | 8 ++++---- examples/qtconcurrent/CMakeLists.txt | 6 +++--- examples/qtconcurrent/imagescaling/CMakeLists.txt | 10 +++++----- examples/qtconcurrent/map/CMakeLists.txt | 6 +++--- examples/qtconcurrent/progressdialog/CMakeLists.txt | 8 ++++---- examples/qtconcurrent/runfunction/CMakeLists.txt | 8 ++++---- examples/qtconcurrent/wordcount/CMakeLists.txt | 8 ++++---- examples/qtestlib/CMakeLists.txt | 2 +- examples/qtestlib/tutorial1/CMakeLists.txt | 8 ++++---- examples/qtestlib/tutorial2/CMakeLists.txt | 8 ++++---- examples/qtestlib/tutorial3/CMakeLists.txt | 8 ++++---- examples/qtestlib/tutorial4/CMakeLists.txt | 8 ++++---- examples/qtestlib/tutorial5/CMakeLists.txt | 8 ++++---- examples/sql/CMakeLists.txt | 4 ++-- examples/sql/books/CMakeLists.txt | 8 ++++---- examples/sql/cachedtable/CMakeLists.txt | 8 ++++---- examples/sql/drilldown/CMakeLists.txt | 8 ++++---- examples/sql/masterdetail/CMakeLists.txt | 10 +++++----- examples/sql/querymodel/CMakeLists.txt | 8 ++++---- examples/sql/relationaltablemodel/CMakeLists.txt | 8 ++++---- examples/sql/sqlbrowser/CMakeLists.txt | 8 ++++---- examples/sql/sqlwidgetmapper/CMakeLists.txt | 8 ++++---- examples/sql/tablemodel/CMakeLists.txt | 8 ++++---- examples/vulkan/CMakeLists.txt | 4 ++-- examples/vulkan/hellovulkancubes/CMakeLists.txt | 8 ++++---- examples/vulkan/hellovulkantexture/CMakeLists.txt | 4 ++-- examples/vulkan/hellovulkantriangle/CMakeLists.txt | 4 ++-- examples/vulkan/hellovulkanwidget/CMakeLists.txt | 6 +++--- examples/vulkan/hellovulkanwindow/CMakeLists.txt | 4 ++-- examples/widgets/CMakeLists.txt | 4 ++-- examples/widgets/animation/easing/CMakeLists.txt | 6 +++--- examples/widgets/desktop/screenshot/CMakeLists.txt | 6 +++--- examples/widgets/desktop/systray/CMakeLists.txt | 6 +++--- examples/widgets/dialogs/CMakeLists.txt | 2 +- examples/widgets/dialogs/classwizard/CMakeLists.txt | 6 +++--- examples/widgets/dialogs/extension/CMakeLists.txt | 6 +++--- examples/widgets/dialogs/findfiles/CMakeLists.txt | 6 +++--- .../widgets/dialogs/licensewizard/CMakeLists.txt | 8 ++++---- .../widgets/dialogs/standarddialogs/CMakeLists.txt | 6 +++--- examples/widgets/dialogs/tabdialog/CMakeLists.txt | 6 +++--- .../widgets/dialogs/trivialwizard/CMakeLists.txt | 6 +++--- .../draganddrop/draggableicons/CMakeLists.txt | 6 +++--- .../widgets/draganddrop/draggabletext/CMakeLists.txt | 6 +++--- examples/widgets/draganddrop/dropsite/CMakeLists.txt | 6 +++--- .../widgets/draganddrop/fridgemagnets/CMakeLists.txt | 6 +++--- examples/widgets/draganddrop/puzzle/CMakeLists.txt | 6 +++--- examples/widgets/effects/blurpicker/CMakeLists.txt | 6 +++--- examples/widgets/effects/fademessage/CMakeLists.txt | 6 +++--- examples/widgets/gallery/CMakeLists.txt | 6 +++--- examples/widgets/gestures/CMakeLists.txt | 2 +- .../widgets/gestures/imagegestures/CMakeLists.txt | 6 +++--- .../widgets/graphicsview/anchorlayout/CMakeLists.txt | 6 +++--- .../graphicsview/basicgraphicslayouts/CMakeLists.txt | 6 +++--- examples/widgets/graphicsview/chip/CMakeLists.txt | 10 +++++----- .../graphicsview/collidingmice/CMakeLists.txt | 6 +++--- .../widgets/graphicsview/diagramscene/CMakeLists.txt | 6 +++--- .../graphicsview/dragdroprobot/CMakeLists.txt | 6 +++--- .../widgets/graphicsview/elasticnodes/CMakeLists.txt | 6 +++--- .../graphicsview/embeddeddialogs/CMakeLists.txt | 6 +++--- .../widgets/graphicsview/flowlayout/CMakeLists.txt | 6 +++--- .../graphicsview/simpleanchorlayout/CMakeLists.txt | 6 +++--- .../graphicsview/weatheranchorlayout/CMakeLists.txt | 6 +++--- examples/widgets/itemviews/CMakeLists.txt | 2 +- .../widgets/itemviews/addressbook/CMakeLists.txt | 6 +++--- .../itemviews/basicsortfiltermodel/CMakeLists.txt | 6 +++--- examples/widgets/itemviews/chart/CMakeLists.txt | 6 +++--- .../itemviews/coloreditorfactory/CMakeLists.txt | 6 +++--- .../itemviews/combowidgetmapper/CMakeLists.txt | 6 +++--- .../itemviews/customsortfiltermodel/CMakeLists.txt | 6 +++--- examples/widgets/itemviews/dirview/CMakeLists.txt | 6 +++--- .../itemviews/editabletreemodel/CMakeLists.txt | 6 +++--- examples/widgets/itemviews/fetchmore/CMakeLists.txt | 6 +++--- .../widgets/itemviews/flattreeview/CMakeLists.txt | 6 +++--- .../widgets/itemviews/frozencolumn/CMakeLists.txt | 6 +++--- examples/widgets/itemviews/interview/CMakeLists.txt | 6 +++--- examples/widgets/itemviews/pixelator/CMakeLists.txt | 10 +++++----- examples/widgets/itemviews/puzzle/CMakeLists.txt | 6 +++--- .../widgets/itemviews/simpledommodel/CMakeLists.txt | 8 ++++---- .../widgets/itemviews/simpletreemodel/CMakeLists.txt | 6 +++--- .../itemviews/simplewidgetmapper/CMakeLists.txt | 6 +++--- .../widgets/itemviews/spinboxdelegate/CMakeLists.txt | 6 +++--- .../widgets/itemviews/spreadsheet/CMakeLists.txt | 14 +++++++------- .../widgets/itemviews/stardelegate/CMakeLists.txt | 6 +++--- .../widgets/itemviews/storageview/CMakeLists.txt | 6 +++--- examples/widgets/layouts/basiclayouts/CMakeLists.txt | 6 +++--- examples/widgets/layouts/borderlayout/CMakeLists.txt | 6 +++--- .../widgets/layouts/dynamiclayouts/CMakeLists.txt | 6 +++--- examples/widgets/layouts/flowlayout/CMakeLists.txt | 6 +++--- .../widgets/mainwindows/application/CMakeLists.txt | 6 +++--- .../widgets/mainwindows/dockwidgets/CMakeLists.txt | 14 +++++++------- .../widgets/mainwindows/mainwindow/CMakeLists.txt | 6 +++--- examples/widgets/mainwindows/mdi/CMakeLists.txt | 6 +++--- examples/widgets/mainwindows/menus/CMakeLists.txt | 6 +++--- examples/widgets/mainwindows/sdi/CMakeLists.txt | 6 +++--- examples/widgets/painting/affine/CMakeLists.txt | 8 ++++---- .../widgets/painting/basicdrawing/CMakeLists.txt | 6 +++--- examples/widgets/painting/composition/CMakeLists.txt | 8 ++++---- .../painting/concentriccircles/CMakeLists.txt | 6 +++--- examples/widgets/painting/deform/CMakeLists.txt | 8 ++++---- examples/widgets/painting/fontsampler/CMakeLists.txt | 10 +++++----- examples/widgets/painting/gradients/CMakeLists.txt | 8 ++++---- .../widgets/painting/imagecomposition/CMakeLists.txt | 6 +++--- .../widgets/painting/painterpaths/CMakeLists.txt | 6 +++--- examples/widgets/painting/pathstroke/CMakeLists.txt | 8 ++++---- examples/widgets/painting/shared/CMakeLists.txt | 6 +++--- .../widgets/painting/transformations/CMakeLists.txt | 6 +++--- examples/widgets/richtext/calendar/CMakeLists.txt | 6 +++--- examples/widgets/richtext/orderform/CMakeLists.txt | 10 +++++----- .../richtext/syntaxhighlighter/CMakeLists.txt | 6 +++--- examples/widgets/richtext/textedit/CMakeLists.txt | 14 +++++++------- .../widgets/scroller/graphicsview/CMakeLists.txt | 6 +++--- examples/widgets/tools/completer/CMakeLists.txt | 6 +++--- .../widgets/tools/customcompleter/CMakeLists.txt | 6 +++--- .../tools/echoplugin/echowindow/CMakeLists.txt | 6 +++--- .../widgets/tools/echoplugin/plugin/CMakeLists.txt | 6 +++--- .../widgets/tools/plugandpaint/app/CMakeLists.txt | 2 +- .../plugandpaint/plugins/basictools/CMakeLists.txt | 6 +++--- .../plugandpaint/plugins/extrafilters/CMakeLists.txt | 6 +++--- .../widgets/tools/regularexpression/CMakeLists.txt | 6 +++--- examples/widgets/tools/settingseditor/CMakeLists.txt | 6 +++--- .../widgets/tools/styleplugin/plugin/CMakeLists.txt | 6 +++--- .../tools/styleplugin/stylewindow/CMakeLists.txt | 6 +++--- .../widgets/tools/treemodelcompleter/CMakeLists.txt | 6 +++--- examples/widgets/tools/undo/CMakeLists.txt | 6 +++--- examples/widgets/tools/undoframework/CMakeLists.txt | 6 +++--- examples/widgets/touch/CMakeLists.txt | 2 +- examples/widgets/touch/dials/CMakeLists.txt | 6 +++--- examples/widgets/touch/fingerpaint/CMakeLists.txt | 14 +++++++------- examples/widgets/touch/knobs/CMakeLists.txt | 6 +++--- examples/widgets/touch/pinchzoom/CMakeLists.txt | 6 +++--- .../tutorials/addressbook/part1/CMakeLists.txt | 6 +++--- .../tutorials/addressbook/part2/CMakeLists.txt | 6 +++--- .../tutorials/addressbook/part3/CMakeLists.txt | 6 +++--- .../tutorials/addressbook/part4/CMakeLists.txt | 6 +++--- .../tutorials/addressbook/part5/CMakeLists.txt | 6 +++--- .../tutorials/addressbook/part6/CMakeLists.txt | 6 +++--- .../tutorials/addressbook/part7/CMakeLists.txt | 6 +++--- .../gettingStarted/gsQt/part1/CMakeLists.txt | 6 +++--- .../gettingStarted/gsQt/part2/CMakeLists.txt | 6 +++--- .../gettingStarted/gsQt/part3/CMakeLists.txt | 6 +++--- .../gettingStarted/gsQt/part4/CMakeLists.txt | 6 +++--- .../gettingStarted/gsQt/part5/CMakeLists.txt | 6 +++--- .../tutorials/modelview/1_readonly/CMakeLists.txt | 6 +++--- .../tutorials/modelview/2_formatting/CMakeLists.txt | 6 +++--- .../modelview/3_changingmodel/CMakeLists.txt | 6 +++--- .../tutorials/modelview/4_headers/CMakeLists.txt | 6 +++--- .../tutorials/modelview/5_edit/CMakeLists.txt | 6 +++--- .../tutorials/modelview/6_treeview/CMakeLists.txt | 6 +++--- .../tutorials/modelview/7_selections/CMakeLists.txt | 6 +++--- examples/widgets/tutorials/notepad/CMakeLists.txt | 10 +++++----- .../tutorials/widgets/childwidget/CMakeLists.txt | 6 +++--- .../tutorials/widgets/nestedlayouts/CMakeLists.txt | 6 +++--- .../tutorials/widgets/toplevel/CMakeLists.txt | 6 +++--- .../tutorials/widgets/windowlayout/CMakeLists.txt | 6 +++--- examples/widgets/widgets/analogclock/CMakeLists.txt | 6 +++--- examples/widgets/widgets/calculator/CMakeLists.txt | 6 +++--- .../widgets/widgets/calendarwidget/CMakeLists.txt | 6 +++--- examples/widgets/widgets/charactermap/CMakeLists.txt | 6 +++--- examples/widgets/widgets/codeeditor/CMakeLists.txt | 6 +++--- examples/widgets/widgets/digitalclock/CMakeLists.txt | 6 +++--- examples/widgets/widgets/elidedlabel/CMakeLists.txt | 6 +++--- examples/widgets/widgets/groupbox/CMakeLists.txt | 6 +++--- examples/widgets/widgets/icons/CMakeLists.txt | 6 +++--- examples/widgets/widgets/imageviewer/CMakeLists.txt | 14 +++++++------- examples/widgets/widgets/lineedits/CMakeLists.txt | 6 +++--- examples/widgets/widgets/mousebuttons/CMakeLists.txt | 6 +++--- examples/widgets/widgets/movie/CMakeLists.txt | 6 +++--- examples/widgets/widgets/scribble/CMakeLists.txt | 14 +++++++------- examples/widgets/widgets/shapedclock/CMakeLists.txt | 6 +++--- .../widgets/widgets/shortcuteditor/CMakeLists.txt | 6 +++--- examples/widgets/widgets/sliders/CMakeLists.txt | 6 +++--- examples/widgets/widgets/spinboxes/CMakeLists.txt | 6 +++--- examples/widgets/widgets/styles/CMakeLists.txt | 6 +++--- examples/widgets/widgets/stylesheet/CMakeLists.txt | 6 +++--- examples/widgets/widgets/tablet/CMakeLists.txt | 6 +++--- examples/widgets/widgets/tetrix/CMakeLists.txt | 6 +++--- examples/widgets/widgets/tooltips/CMakeLists.txt | 6 +++--- examples/widgets/widgets/validators/CMakeLists.txt | 6 +++--- examples/widgets/widgets/wiggly/CMakeLists.txt | 6 +++--- examples/widgets/widgets/windowflags/CMakeLists.txt | 6 +++--- examples/widgets/windowcontainer/CMakeLists.txt | 8 ++++---- examples/xml/CMakeLists.txt | 4 ++-- examples/xml/dombookmarks/CMakeLists.txt | 8 ++++---- examples/xml/htmlinfo/CMakeLists.txt | 2 +- examples/xml/rsslisting/CMakeLists.txt | 10 +++++----- examples/xml/streambookmarks/CMakeLists.txt | 8 ++++---- examples/xml/xmlstreamlint/CMakeLists.txt | 4 ++-- 262 files changed, 849 insertions(+), 849 deletions(-) (limited to 'examples') diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b500cbc454..2bc1e4d378 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -6,34 +6,34 @@ qt_examples_build_begin(EXTERNAL_BUILD) add_subdirectory(corelib) add_subdirectory(embedded) add_subdirectory(qpa) -if(TARGET Qt::DBus) +if(TARGET Qt6::DBus) add_subdirectory(dbus) endif() -if(TARGET Qt::Network) +if(TARGET Qt6::Network) add_subdirectory(network) endif() -if(TARGET Qt::Test) +if(TARGET Qt6::Test) add_subdirectory(qtestlib) endif() -if(TARGET Qt::Concurrent) +if(TARGET Qt6::Concurrent) add_subdirectory(qtconcurrent) endif() -if(TARGET Qt::Sql) +if(TARGET Qt6::Sql) add_subdirectory(sql) endif() -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) add_subdirectory(widgets) endif() -if(TARGET Qt::Xml) +if(TARGET Qt6::Xml) add_subdirectory(xml) endif() -if(TARGET Qt::Gui) +if(TARGET Qt6::Gui) add_subdirectory(gui) endif() -if(QT_FEATURE_opengl AND TARGET Qt::Gui) +if(QT_FEATURE_opengl AND TARGET Qt6::Gui) add_subdirectory(opengl) endif() -if(QT_FEATURE_vulkan AND TARGET Qt::Gui) +if(QT_FEATURE_vulkan AND TARGET Qt6::Gui) add_subdirectory(vulkan) endif() diff --git a/examples/corelib/bindableproperties/bindablesubscription/CMakeLists.txt b/examples/corelib/bindableproperties/bindablesubscription/CMakeLists.txt index c4e2f4cb43..e2c97f3083 100644 --- a/examples/corelib/bindableproperties/bindablesubscription/CMakeLists.txt +++ b/examples/corelib/bindableproperties/bindablesubscription/CMakeLists.txt @@ -23,9 +23,9 @@ qt_add_executable(bindablesubscription ) target_link_libraries(bindablesubscription PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/corelib/bindableproperties/subscription/CMakeLists.txt b/examples/corelib/bindableproperties/subscription/CMakeLists.txt index f47dd9d734..c429493d0a 100644 --- a/examples/corelib/bindableproperties/subscription/CMakeLists.txt +++ b/examples/corelib/bindableproperties/subscription/CMakeLists.txt @@ -23,9 +23,9 @@ qt_add_executable(subscription ) target_link_libraries(subscription PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/corelib/ipc/CMakeLists.txt b/examples/corelib/ipc/CMakeLists.txt index 7aefe3bda0..d1cfc7bc1b 100644 --- a/examples/corelib/ipc/CMakeLists.txt +++ b/examples/corelib/ipc/CMakeLists.txt @@ -1,13 +1,13 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Widgets) +if(NOT TARGET Qt6::Widgets) return() endif() if(QT_FEATURE_sharedmemory) qt_internal_add_example(sharedmemory) endif() -if(QT_FEATURE_localserver AND TARGET Qt::Network) +if(QT_FEATURE_localserver AND TARGET Qt6::Network) qt_internal_add_example(localfortuneserver) qt_internal_add_example(localfortuneclient) endif() diff --git a/examples/corelib/ipc/localfortuneclient/CMakeLists.txt b/examples/corelib/ipc/localfortuneclient/CMakeLists.txt index bafd2a9d3e..e0102f598c 100644 --- a/examples/corelib/ipc/localfortuneclient/CMakeLists.txt +++ b/examples/corelib/ipc/localfortuneclient/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(localfortuneclient PROPERTIES ) target_link_libraries(localfortuneclient PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS localfortuneclient diff --git a/examples/corelib/ipc/localfortuneserver/CMakeLists.txt b/examples/corelib/ipc/localfortuneserver/CMakeLists.txt index 4a899e5da7..85af3ee410 100644 --- a/examples/corelib/ipc/localfortuneserver/CMakeLists.txt +++ b/examples/corelib/ipc/localfortuneserver/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(localfortuneserver PROPERTIES ) target_link_libraries(localfortuneserver PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS localfortuneserver diff --git a/examples/corelib/ipc/sharedmemory/CMakeLists.txt b/examples/corelib/ipc/sharedmemory/CMakeLists.txt index c0174e9b16..79a70f8bed 100644 --- a/examples/corelib/ipc/sharedmemory/CMakeLists.txt +++ b/examples/corelib/ipc/sharedmemory/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(sharedmemory PROPERTIES ) target_link_libraries(sharedmemory PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS sharedmemory diff --git a/examples/corelib/mimetypes/CMakeLists.txt b/examples/corelib/mimetypes/CMakeLists.txt index 20ac09fc27..9ba3873bf4 100644 --- a/examples/corelib/mimetypes/CMakeLists.txt +++ b/examples/corelib/mimetypes/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(mimetypebrowser) endif() diff --git a/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt b/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt index fbb03522fa..1a54521823 100644 --- a/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt +++ b/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(mimetypebrowser PROPERTIES ) target_link_libraries(mimetypebrowser PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS mimetypebrowser diff --git a/examples/corelib/permissions/CMakeLists.txt b/examples/corelib/permissions/CMakeLists.txt index 69f91d519f..c9cb76487c 100644 --- a/examples/corelib/permissions/CMakeLists.txt +++ b/examples/corelib/permissions/CMakeLists.txt @@ -28,9 +28,9 @@ set_target_properties(permissions PROPERTIES qt_finalize_executable(permissions) target_link_libraries(permissions PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS permissions diff --git a/examples/corelib/serialization/cbordump/CMakeLists.txt b/examples/corelib/serialization/cbordump/CMakeLists.txt index 6d64a21fbe..29632060bd 100644 --- a/examples/corelib/serialization/cbordump/CMakeLists.txt +++ b/examples/corelib/serialization/cbordump/CMakeLists.txt @@ -19,7 +19,7 @@ qt_add_executable(cbordump ) target_link_libraries(cbordump PUBLIC - Qt::Core + Qt6::Core ) install(TARGETS cbordump diff --git a/examples/corelib/serialization/convert/CMakeLists.txt b/examples/corelib/serialization/convert/CMakeLists.txt index 45ca69fa19..d6d528b1a4 100644 --- a/examples/corelib/serialization/convert/CMakeLists.txt +++ b/examples/corelib/serialization/convert/CMakeLists.txt @@ -26,7 +26,7 @@ qt_add_executable(convert ) target_link_libraries(convert PUBLIC - Qt::Core + Qt6::Core ) install(TARGETS convert diff --git a/examples/corelib/serialization/savegame/CMakeLists.txt b/examples/corelib/serialization/savegame/CMakeLists.txt index 3ffc23a3a7..05a6a494f5 100644 --- a/examples/corelib/serialization/savegame/CMakeLists.txt +++ b/examples/corelib/serialization/savegame/CMakeLists.txt @@ -22,7 +22,7 @@ qt_add_executable(savegame ) target_link_libraries(savegame PUBLIC - Qt::Core + Qt6::Core ) install(TARGETS savegame diff --git a/examples/corelib/threads/CMakeLists.txt b/examples/corelib/threads/CMakeLists.txt index 694e23a6db..4ced9a50e5 100644 --- a/examples/corelib/threads/CMakeLists.txt +++ b/examples/corelib/threads/CMakeLists.txt @@ -3,7 +3,7 @@ qt_internal_add_example(semaphores) qt_internal_add_example(waitconditions) -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(mandelbrot) qt_internal_add_example(queuedcustomtype) endif() diff --git a/examples/corelib/threads/mandelbrot/CMakeLists.txt b/examples/corelib/threads/mandelbrot/CMakeLists.txt index d72e6db37f..8b4b1be4bd 100644 --- a/examples/corelib/threads/mandelbrot/CMakeLists.txt +++ b/examples/corelib/threads/mandelbrot/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(mandelbrot PROPERTIES ) target_link_libraries(mandelbrot PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS mandelbrot diff --git a/examples/corelib/threads/queuedcustomtype/CMakeLists.txt b/examples/corelib/threads/queuedcustomtype/CMakeLists.txt index d0895378ac..5050487686 100644 --- a/examples/corelib/threads/queuedcustomtype/CMakeLists.txt +++ b/examples/corelib/threads/queuedcustomtype/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(queuedcustomtype PROPERTIES ) target_link_libraries(queuedcustomtype PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS queuedcustomtype diff --git a/examples/corelib/threads/semaphores/CMakeLists.txt b/examples/corelib/threads/semaphores/CMakeLists.txt index d84d95d0cf..652ab05bcb 100644 --- a/examples/corelib/threads/semaphores/CMakeLists.txt +++ b/examples/corelib/threads/semaphores/CMakeLists.txt @@ -19,7 +19,7 @@ qt_add_executable(semaphores ) target_link_libraries(semaphores PUBLIC - Qt::Core + Qt6::Core ) install(TARGETS semaphores diff --git a/examples/corelib/threads/waitconditions/CMakeLists.txt b/examples/corelib/threads/waitconditions/CMakeLists.txt index b89b2b291e..d8b8ae5862 100644 --- a/examples/corelib/threads/waitconditions/CMakeLists.txt +++ b/examples/corelib/threads/waitconditions/CMakeLists.txt @@ -19,7 +19,7 @@ qt_add_executable(waitconditions ) target_link_libraries(waitconditions PUBLIC - Qt::Core + Qt6::Core ) install(TARGETS waitconditions diff --git a/examples/corelib/tools/CMakeLists.txt b/examples/corelib/tools/CMakeLists.txt index cac428f424..0ec145da29 100644 --- a/examples/corelib/tools/CMakeLists.txt +++ b/examples/corelib/tools/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Widgets) +if(NOT TARGET Qt6::Widgets) return() endif() qt_internal_add_example(contiguouscache) diff --git a/examples/corelib/tools/contiguouscache/CMakeLists.txt b/examples/corelib/tools/contiguouscache/CMakeLists.txt index ffd5b0e1cb..4c5c8847f7 100644 --- a/examples/corelib/tools/contiguouscache/CMakeLists.txt +++ b/examples/corelib/tools/contiguouscache/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(contiguouscache PROPERTIES ) target_link_libraries(contiguouscache PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS contiguouscache diff --git a/examples/corelib/tools/customtype/CMakeLists.txt b/examples/corelib/tools/customtype/CMakeLists.txt index aef2ffecc0..408cc97a14 100644 --- a/examples/corelib/tools/customtype/CMakeLists.txt +++ b/examples/corelib/tools/customtype/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(customtype PROPERTIES ) target_link_libraries(customtype PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS customtype diff --git a/examples/corelib/tools/customtypesending/CMakeLists.txt b/examples/corelib/tools/customtypesending/CMakeLists.txt index ac0c5de88e..c784d302e7 100644 --- a/examples/corelib/tools/customtypesending/CMakeLists.txt +++ b/examples/corelib/tools/customtypesending/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(customtypesending PROPERTIES ) target_link_libraries(customtypesending PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS customtypesending diff --git a/examples/dbus/CMakeLists.txt b/examples/dbus/CMakeLists.txt index 8f0c21d716..bd9d232f90 100644 --- a/examples/dbus/CMakeLists.txt +++ b/examples/dbus/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::DBus) +if(NOT TARGET Qt6::DBus) return() endif() qt_internal_add_example(listnames) @@ -9,7 +9,7 @@ qt_internal_add_example(pingpong) if(QT_FEATURE_process) qt_internal_add_example(complexpingpong) endif() -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(chat) add_subdirectory(remotecontrolledcar) endif() diff --git a/examples/dbus/chat/CMakeLists.txt b/examples/dbus/chat/CMakeLists.txt index e7245fd7d6..b517ff4929 100644 --- a/examples/dbus/chat/CMakeLists.txt +++ b/examples/dbus/chat/CMakeLists.txt @@ -43,10 +43,10 @@ set_target_properties(chat PROPERTIES ) target_link_libraries(chat PUBLIC - Qt::Core - Qt::DBus - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::DBus + Qt6::Gui + Qt6::Widgets ) install(TARGETS chat diff --git a/examples/dbus/listnames/CMakeLists.txt b/examples/dbus/listnames/CMakeLists.txt index ff1debcb38..3b92cafa96 100644 --- a/examples/dbus/listnames/CMakeLists.txt +++ b/examples/dbus/listnames/CMakeLists.txt @@ -19,8 +19,8 @@ qt_add_executable(listnames ) target_link_libraries(listnames PUBLIC - Qt::Core - Qt::DBus + Qt6::Core + Qt6::DBus ) install(TARGETS listnames diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt index aac276db71..5e2cebea37 100644 --- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt @@ -36,10 +36,10 @@ set_target_properties(car PROPERTIES ) target_link_libraries(car PUBLIC - Qt::Core - Qt::DBus - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::DBus + Qt6::Gui + Qt6::Widgets ) install(TARGETS car diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt index 1c40129225..476efb24da 100644 --- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt @@ -35,10 +35,10 @@ set_target_properties(controller PROPERTIES ) target_link_libraries(controller PUBLIC - Qt::Core - Qt::DBus - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::DBus + Qt6::Gui + Qt6::Widgets ) install(TARGETS controller diff --git a/examples/embedded/CMakeLists.txt b/examples/embedded/CMakeLists.txt index adc3da05be..1eb8bc7537 100644 --- a/examples/embedded/CMakeLists.txt +++ b/examples/embedded/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Gui OR (NOT embedded AND NOT x11)) +if(NOT TARGET Qt6::Gui OR (NOT embedded AND NOT x11)) return() endif() qt_internal_add_example(styleexample) diff --git a/examples/embedded/digiflip/CMakeLists.txt b/examples/embedded/digiflip/CMakeLists.txt index 3c2372fdee..8c3864b288 100644 --- a/examples/embedded/digiflip/CMakeLists.txt +++ b/examples/embedded/digiflip/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(digiflip PROPERTIES ) target_link_libraries(digiflip PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS digiflip diff --git a/examples/embedded/flickable/CMakeLists.txt b/examples/embedded/flickable/CMakeLists.txt index d8312600ef..fdfae20820 100644 --- a/examples/embedded/flickable/CMakeLists.txt +++ b/examples/embedded/flickable/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(flickable PROPERTIES ) target_link_libraries(flickable PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS flickable diff --git a/examples/embedded/flightinfo/CMakeLists.txt b/examples/embedded/flightinfo/CMakeLists.txt index 9dec1bd669..acc66af426 100644 --- a/examples/embedded/flightinfo/CMakeLists.txt +++ b/examples/embedded/flightinfo/CMakeLists.txt @@ -26,10 +26,10 @@ set_target_properties(flightinfo PROPERTIES ) target_link_libraries(flightinfo PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) # Resources: diff --git a/examples/embedded/lightmaps/CMakeLists.txt b/examples/embedded/lightmaps/CMakeLists.txt index 9adc45e0ec..d6e1f9bb88 100644 --- a/examples/embedded/lightmaps/CMakeLists.txt +++ b/examples/embedded/lightmaps/CMakeLists.txt @@ -27,10 +27,10 @@ set_target_properties(lightmaps PROPERTIES ) target_link_libraries(lightmaps PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS lightmaps diff --git a/examples/embedded/raycasting/CMakeLists.txt b/examples/embedded/raycasting/CMakeLists.txt index d65b49dca3..1506415e30 100644 --- a/examples/embedded/raycasting/CMakeLists.txt +++ b/examples/embedded/raycasting/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(raycasting PROPERTIES ) target_link_libraries(raycasting PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/embedded/styleexample/CMakeLists.txt b/examples/embedded/styleexample/CMakeLists.txt index 7a13a8747a..89c2e4f02f 100644 --- a/examples/embedded/styleexample/CMakeLists.txt +++ b/examples/embedded/styleexample/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(styleexample PROPERTIES ) target_link_libraries(styleexample PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/gui/CMakeLists.txt b/examples/gui/CMakeLists.txt index bf9c05df73..83faae6765 100644 --- a/examples/gui/CMakeLists.txt +++ b/examples/gui/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Gui) +if(NOT TARGET Qt6::Gui) return() endif() qt_internal_add_example(analogclock) diff --git a/examples/gui/analogclock/CMakeLists.txt b/examples/gui/analogclock/CMakeLists.txt index 7c5268b7b0..e5ee4d0e6e 100644 --- a/examples/gui/analogclock/CMakeLists.txt +++ b/examples/gui/analogclock/CMakeLists.txt @@ -29,8 +29,8 @@ target_include_directories(gui_analogclock PUBLIC ) target_link_libraries(gui_analogclock PUBLIC - Qt::Core - Qt::Gui + Qt6::Core + Qt6::Gui ) install(TARGETS gui_analogclock diff --git a/examples/gui/rasterwindow/CMakeLists.txt b/examples/gui/rasterwindow/CMakeLists.txt index 533a812ede..8313c176c6 100644 --- a/examples/gui/rasterwindow/CMakeLists.txt +++ b/examples/gui/rasterwindow/CMakeLists.txt @@ -25,8 +25,8 @@ set_target_properties(rasterwindow PROPERTIES ) target_link_libraries(rasterwindow PUBLIC - Qt::Core - Qt::Gui + Qt6::Core + Qt6::Gui ) install(TARGETS rasterwindow diff --git a/examples/network/CMakeLists.txt b/examples/network/CMakeLists.txt index 4dc0568c79..59a97cca89 100644 --- a/examples/network/CMakeLists.txt +++ b/examples/network/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Network) +if(NOT TARGET Qt6::Network) return() endif() qt_internal_add_example(download) @@ -9,7 +9,7 @@ qt_internal_add_example(downloadmanager) if(NOT INTEGRITY) qt_internal_add_example(dnslookup) endif() -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(blockingfortuneclient) qt_internal_add_example(broadcastreceiver) qt_internal_add_example(broadcastsender) @@ -23,17 +23,17 @@ if(TARGET Qt::Widgets) qt_internal_add_example(fortuneclient) qt_internal_add_example(fortuneserver) endif() -if(QT_FEATURE_processenvironment AND TARGET Qt::Widgets) +if(QT_FEATURE_processenvironment AND TARGET Qt6::Widgets) qt_internal_add_example(network-chat) endif() -if(QT_FEATURE_ssl AND TARGET Qt::Widgets) +if(QT_FEATURE_ssl AND TARGET Qt6::Widgets) qt_internal_add_example(securesocketclient) endif() -if(QT_FEATURE_dtls AND TARGET Qt::Widgets) +if(QT_FEATURE_dtls AND TARGET Qt6::Widgets) qt_internal_add_example(secureudpserver) qt_internal_add_example(secureudpclient) endif() -if(QT_FEATURE_sctp AND TARGET Qt::Widgets) +if(QT_FEATURE_sctp AND TARGET Qt6::Widgets) qt_internal_add_example(multistreamserver) qt_internal_add_example(multistreamclient) endif() diff --git a/examples/network/blockingfortuneclient/CMakeLists.txt b/examples/network/blockingfortuneclient/CMakeLists.txt index 698eefc723..cd4680c5db 100644 --- a/examples/network/blockingfortuneclient/CMakeLists.txt +++ b/examples/network/blockingfortuneclient/CMakeLists.txt @@ -26,10 +26,10 @@ set_target_properties(blockingfortuneclient PROPERTIES ) target_link_libraries(blockingfortuneclient PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS blockingfortuneclient diff --git a/examples/network/broadcastreceiver/CMakeLists.txt b/examples/network/broadcastreceiver/CMakeLists.txt index 30a55ddba7..e5a445b4b7 100644 --- a/examples/network/broadcastreceiver/CMakeLists.txt +++ b/examples/network/broadcastreceiver/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(broadcastreceiver PROPERTIES ) target_link_libraries(broadcastreceiver PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS broadcastreceiver diff --git a/examples/network/broadcastsender/CMakeLists.txt b/examples/network/broadcastsender/CMakeLists.txt index 637fb34acc..3458425355 100644 --- a/examples/network/broadcastsender/CMakeLists.txt +++ b/examples/network/broadcastsender/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(broadcastsender PROPERTIES ) target_link_libraries(broadcastsender PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS broadcastsender diff --git a/examples/network/dnslookup/CMakeLists.txt b/examples/network/dnslookup/CMakeLists.txt index 3353066a32..92080dbc3f 100644 --- a/examples/network/dnslookup/CMakeLists.txt +++ b/examples/network/dnslookup/CMakeLists.txt @@ -19,8 +19,8 @@ qt_add_executable(dnslookup ) target_link_libraries(dnslookup PUBLIC - Qt::Core - Qt::Network + Qt6::Core + Qt6::Network ) install(TARGETS dnslookup diff --git a/examples/network/download/CMakeLists.txt b/examples/network/download/CMakeLists.txt index 4959ec4eae..12b50ab6a5 100644 --- a/examples/network/download/CMakeLists.txt +++ b/examples/network/download/CMakeLists.txt @@ -19,8 +19,8 @@ qt_add_executable(download ) target_link_libraries(download PUBLIC - Qt::Core - Qt::Network + Qt6::Core + Qt6::Network ) install(TARGETS download diff --git a/examples/network/downloadmanager/CMakeLists.txt b/examples/network/downloadmanager/CMakeLists.txt index ea0f2a0949..dfb4cd5c21 100644 --- a/examples/network/downloadmanager/CMakeLists.txt +++ b/examples/network/downloadmanager/CMakeLists.txt @@ -21,8 +21,8 @@ qt_add_executable(downloadmanager ) target_link_libraries(downloadmanager PUBLIC - Qt::Core - Qt::Network + Qt6::Core + Qt6::Network ) install(TARGETS downloadmanager diff --git a/examples/network/fortuneclient/CMakeLists.txt b/examples/network/fortuneclient/CMakeLists.txt index 1698da183e..253e529a91 100644 --- a/examples/network/fortuneclient/CMakeLists.txt +++ b/examples/network/fortuneclient/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(fortuneclient PROPERTIES ) target_link_libraries(fortuneclient PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS fortuneclient diff --git a/examples/network/fortuneserver/CMakeLists.txt b/examples/network/fortuneserver/CMakeLists.txt index 280b36c0dd..d387bd8e9a 100644 --- a/examples/network/fortuneserver/CMakeLists.txt +++ b/examples/network/fortuneserver/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(fortuneserver PROPERTIES ) target_link_libraries(fortuneserver PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS fortuneserver diff --git a/examples/network/googlesuggest/CMakeLists.txt b/examples/network/googlesuggest/CMakeLists.txt index e90bc9332d..7c6020d54a 100644 --- a/examples/network/googlesuggest/CMakeLists.txt +++ b/examples/network/googlesuggest/CMakeLists.txt @@ -26,10 +26,10 @@ set_target_properties(googlesuggest PROPERTIES ) target_link_libraries(googlesuggest PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS googlesuggest diff --git a/examples/network/http/CMakeLists.txt b/examples/network/http/CMakeLists.txt index f84290917e..43a83b7d4a 100644 --- a/examples/network/http/CMakeLists.txt +++ b/examples/network/http/CMakeLists.txt @@ -27,10 +27,10 @@ set_target_properties(http PROPERTIES ) target_link_libraries(http PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS http diff --git a/examples/network/loopback/CMakeLists.txt b/examples/network/loopback/CMakeLists.txt index 4152491946..5229430fed 100644 --- a/examples/network/loopback/CMakeLists.txt +++ b/examples/network/loopback/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(loopback PROPERTIES ) target_link_libraries(loopback PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS loopback diff --git a/examples/network/multicastreceiver/CMakeLists.txt b/examples/network/multicastreceiver/CMakeLists.txt index 2b19e7c1b4..ca80b508e2 100644 --- a/examples/network/multicastreceiver/CMakeLists.txt +++ b/examples/network/multicastreceiver/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(multicastreceiver PROPERTIES ) target_link_libraries(multicastreceiver PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS multicastreceiver diff --git a/examples/network/multicastsender/CMakeLists.txt b/examples/network/multicastsender/CMakeLists.txt index c762e8a8b5..879dc7af20 100644 --- a/examples/network/multicastsender/CMakeLists.txt +++ b/examples/network/multicastsender/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(multicastsender PROPERTIES ) target_link_libraries(multicastsender PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS multicastsender diff --git a/examples/network/multistreamclient/CMakeLists.txt b/examples/network/multistreamclient/CMakeLists.txt index 3048b71d65..512c2364eb 100644 --- a/examples/network/multistreamclient/CMakeLists.txt +++ b/examples/network/multistreamclient/CMakeLists.txt @@ -29,10 +29,10 @@ set_target_properties(multistreamclient PROPERTIES ) target_link_libraries(multistreamclient PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS multistreamclient diff --git a/examples/network/multistreamserver/CMakeLists.txt b/examples/network/multistreamserver/CMakeLists.txt index 1cd592c321..8c0b432748 100644 --- a/examples/network/multistreamserver/CMakeLists.txt +++ b/examples/network/multistreamserver/CMakeLists.txt @@ -29,10 +29,10 @@ set_target_properties(multistreamserver PROPERTIES ) target_link_libraries(multistreamserver PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS multistreamserver diff --git a/examples/network/network-chat/CMakeLists.txt b/examples/network/network-chat/CMakeLists.txt index 8fc009cc5f..9ec480926e 100644 --- a/examples/network/network-chat/CMakeLists.txt +++ b/examples/network/network-chat/CMakeLists.txt @@ -30,10 +30,10 @@ set_target_properties(network-chat PROPERTIES ) target_link_libraries(network-chat PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS network-chat diff --git a/examples/network/securesocketclient/CMakeLists.txt b/examples/network/securesocketclient/CMakeLists.txt index 6dc56024b3..65b222a7b0 100644 --- a/examples/network/securesocketclient/CMakeLists.txt +++ b/examples/network/securesocketclient/CMakeLists.txt @@ -28,10 +28,10 @@ set_target_properties(securesocketclient PROPERTIES ) target_link_libraries(securesocketclient PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) # Resources: diff --git a/examples/network/secureudpclient/CMakeLists.txt b/examples/network/secureudpclient/CMakeLists.txt index 64803a211b..0098f8665d 100644 --- a/examples/network/secureudpclient/CMakeLists.txt +++ b/examples/network/secureudpclient/CMakeLists.txt @@ -28,10 +28,10 @@ set_target_properties(secureudpclient PROPERTIES ) target_link_libraries(secureudpclient PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS secureudpclient diff --git a/examples/network/secureudpserver/CMakeLists.txt b/examples/network/secureudpserver/CMakeLists.txt index 6b5698d3fd..a2e91f011b 100644 --- a/examples/network/secureudpserver/CMakeLists.txt +++ b/examples/network/secureudpserver/CMakeLists.txt @@ -28,10 +28,10 @@ set_target_properties(secureudpserver PROPERTIES ) target_link_libraries(secureudpserver PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS secureudpserver diff --git a/examples/network/threadedfortuneserver/CMakeLists.txt b/examples/network/threadedfortuneserver/CMakeLists.txt index ffc74c605c..8cefe0864c 100644 --- a/examples/network/threadedfortuneserver/CMakeLists.txt +++ b/examples/network/threadedfortuneserver/CMakeLists.txt @@ -27,10 +27,10 @@ set_target_properties(threadedfortuneserver PROPERTIES ) target_link_libraries(threadedfortuneserver PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS threadedfortuneserver diff --git a/examples/network/torrent/CMakeLists.txt b/examples/network/torrent/CMakeLists.txt index f6f0998c56..cf042c9f67 100644 --- a/examples/network/torrent/CMakeLists.txt +++ b/examples/network/torrent/CMakeLists.txt @@ -37,10 +37,10 @@ set_target_properties(torrent PROPERTIES ) target_link_libraries(torrent PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) # Resources: diff --git a/examples/opengl/2dpainting/CMakeLists.txt b/examples/opengl/2dpainting/CMakeLists.txt index 38bd957b01..8f508090be 100644 --- a/examples/opengl/2dpainting/CMakeLists.txt +++ b/examples/opengl/2dpainting/CMakeLists.txt @@ -28,11 +28,11 @@ set_target_properties(2dpainting PROPERTIES ) target_link_libraries(2dpainting PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL - Qt::OpenGLWidgets - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::OpenGL + Qt6::OpenGLWidgets + Qt6::Widgets ) install(TARGETS 2dpainting diff --git a/examples/opengl/CMakeLists.txt b/examples/opengl/CMakeLists.txt index fd75641669..9c6768f324 100644 --- a/examples/opengl/CMakeLists.txt +++ b/examples/opengl/CMakeLists.txt @@ -5,7 +5,7 @@ qt_internal_add_example(hellowindow) qt_internal_add_example(paintedwindow) qt_internal_add_example(openglwindow) qt_internal_add_example(qopenglwindow) -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(contextinfo) qt_internal_add_example(threadedqopenglwidget) qt_internal_add_example(2dpainting) diff --git a/examples/opengl/computegles31/CMakeLists.txt b/examples/opengl/computegles31/CMakeLists.txt index 03c7bbb6ba..ea1cc23eb7 100644 --- a/examples/opengl/computegles31/CMakeLists.txt +++ b/examples/opengl/computegles31/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(computegles31 PROPERTIES ) target_link_libraries(computegles31 PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL + Qt6::Core + Qt6::Gui + Qt6::OpenGL ) # Resources: diff --git a/examples/opengl/contextinfo/CMakeLists.txt b/examples/opengl/contextinfo/CMakeLists.txt index 5cbad18256..fbec66adc5 100644 --- a/examples/opengl/contextinfo/CMakeLists.txt +++ b/examples/opengl/contextinfo/CMakeLists.txt @@ -26,10 +26,10 @@ set_target_properties(contextinfo PROPERTIES ) target_link_libraries(contextinfo PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::OpenGL + Qt6::Widgets ) install(TARGETS contextinfo diff --git a/examples/opengl/cube/CMakeLists.txt b/examples/opengl/cube/CMakeLists.txt index 10d205ae8c..eadfce631a 100644 --- a/examples/opengl/cube/CMakeLists.txt +++ b/examples/opengl/cube/CMakeLists.txt @@ -26,11 +26,11 @@ set_target_properties(cube PROPERTIES ) target_link_libraries(cube PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL - Qt::OpenGLWidgets - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::OpenGL + Qt6::OpenGLWidgets + Qt6::Widgets ) # Resources: diff --git a/examples/opengl/hellogl2/CMakeLists.txt b/examples/opengl/hellogl2/CMakeLists.txt index 62423d4fef..2095c0ebf2 100644 --- a/examples/opengl/hellogl2/CMakeLists.txt +++ b/examples/opengl/hellogl2/CMakeLists.txt @@ -28,11 +28,11 @@ set_target_properties(hellogl2 PROPERTIES ) target_link_libraries(hellogl2 PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL - Qt::OpenGLWidgets - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::OpenGL + Qt6::OpenGLWidgets + Qt6::Widgets ) install(TARGETS hellogl2 diff --git a/examples/opengl/hellogles3/CMakeLists.txt b/examples/opengl/hellogles3/CMakeLists.txt index 8b7096a92f..230a6da8b0 100644 --- a/examples/opengl/hellogles3/CMakeLists.txt +++ b/examples/opengl/hellogles3/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(hellogles3 PROPERTIES ) target_link_libraries(hellogles3 PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL + Qt6::Core + Qt6::Gui + Qt6::OpenGL ) # Resources: diff --git a/examples/opengl/hellowindow/CMakeLists.txt b/examples/opengl/hellowindow/CMakeLists.txt index 298ea675d4..00291e8918 100644 --- a/examples/opengl/hellowindow/CMakeLists.txt +++ b/examples/opengl/hellowindow/CMakeLists.txt @@ -25,11 +25,11 @@ set_target_properties(hellowindow PROPERTIES ) target_link_libraries(hellowindow PUBLIC - Qt::Core - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::OpenGL + Qt6::Core + Qt6::CorePrivate + Qt6::Gui + Qt6::GuiPrivate + Qt6::OpenGL ) install(TARGETS hellowindow diff --git a/examples/opengl/openglwindow/CMakeLists.txt b/examples/opengl/openglwindow/CMakeLists.txt index c03b681f6c..250c8f70db 100644 --- a/examples/opengl/openglwindow/CMakeLists.txt +++ b/examples/opengl/openglwindow/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(openglwindow PROPERTIES ) target_link_libraries(openglwindow PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL + Qt6::Core + Qt6::Gui + Qt6::OpenGL ) install(TARGETS openglwindow diff --git a/examples/opengl/paintedwindow/CMakeLists.txt b/examples/opengl/paintedwindow/CMakeLists.txt index 3e6eb3bc69..782e9f14c7 100644 --- a/examples/opengl/paintedwindow/CMakeLists.txt +++ b/examples/opengl/paintedwindow/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(paintedwindow PROPERTIES ) target_link_libraries(paintedwindow PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL + Qt6::Core + Qt6::Gui + Qt6::OpenGL ) install(TARGETS paintedwindow diff --git a/examples/opengl/qopenglwidget/CMakeLists.txt b/examples/opengl/qopenglwidget/CMakeLists.txt index 37ead1e645..dcb0411a3e 100644 --- a/examples/opengl/qopenglwidget/CMakeLists.txt +++ b/examples/opengl/qopenglwidget/CMakeLists.txt @@ -27,11 +27,11 @@ set_target_properties(qopenglwidget PROPERTIES ) target_link_libraries(qopenglwidget PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL - Qt::OpenGLWidgets - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::OpenGL + Qt6::OpenGLWidgets + Qt6::Widgets ) # Resources: diff --git a/examples/opengl/qopenglwindow/CMakeLists.txt b/examples/opengl/qopenglwindow/CMakeLists.txt index 2380b59c4b..be03f24f9b 100644 --- a/examples/opengl/qopenglwindow/CMakeLists.txt +++ b/examples/opengl/qopenglwindow/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(qopenglwindow PROPERTIES ) target_link_libraries(qopenglwindow PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL + Qt6::Core + Qt6::Gui + Qt6::OpenGL ) # Resources: diff --git a/examples/opengl/textures/CMakeLists.txt b/examples/opengl/textures/CMakeLists.txt index e4bb8a8324..08a044c9b7 100644 --- a/examples/opengl/textures/CMakeLists.txt +++ b/examples/opengl/textures/CMakeLists.txt @@ -26,11 +26,11 @@ set_target_properties(textures PROPERTIES ) target_link_libraries(textures PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL - Qt::OpenGLWidgets - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::OpenGL + Qt6::OpenGLWidgets + Qt6::Widgets ) # Resources: diff --git a/examples/opengl/threadedqopenglwidget/CMakeLists.txt b/examples/opengl/threadedqopenglwidget/CMakeLists.txt index 396fb5ed4f..0a944ef0b5 100644 --- a/examples/opengl/threadedqopenglwidget/CMakeLists.txt +++ b/examples/opengl/threadedqopenglwidget/CMakeLists.txt @@ -27,11 +27,11 @@ set_target_properties(threadedqopenglwidget PROPERTIES ) target_link_libraries(threadedqopenglwidget PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL - Qt::OpenGLWidgets - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::OpenGL + Qt6::OpenGLWidgets + Qt6::Widgets ) install(TARGETS threadedqopenglwidget diff --git a/examples/qpa/CMakeLists.txt b/examples/qpa/CMakeLists.txt index 67c84c2e5a..a2b115fdf3 100644 --- a/examples/qpa/CMakeLists.txt +++ b/examples/qpa/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Gui) +if(NOT TARGET Qt6::Gui) return() endif() qt_internal_add_example(windows) diff --git a/examples/qpa/qrasterwindow/CMakeLists.txt b/examples/qpa/qrasterwindow/CMakeLists.txt index aecfe4cd78..1b9d2c41b5 100644 --- a/examples/qpa/qrasterwindow/CMakeLists.txt +++ b/examples/qpa/qrasterwindow/CMakeLists.txt @@ -24,8 +24,8 @@ set_target_properties(qrasterwindow PROPERTIES ) target_link_libraries(qrasterwindow PUBLIC - Qt::Core - Qt::Gui + Qt6::Core + Qt6::Gui ) install(TARGETS qrasterwindow diff --git a/examples/qpa/windows/CMakeLists.txt b/examples/qpa/windows/CMakeLists.txt index bc1fce3e09..90ca0c3ee7 100644 --- a/examples/qpa/windows/CMakeLists.txt +++ b/examples/qpa/windows/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(windows PROPERTIES ) target_link_libraries(windows PUBLIC - Qt::Core - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate + Qt6::Core + Qt6::CorePrivate + Qt6::Gui + Qt6::GuiPrivate ) install(TARGETS windows diff --git a/examples/qtconcurrent/CMakeLists.txt b/examples/qtconcurrent/CMakeLists.txt index 6e9a3dc9f3..89462b589c 100644 --- a/examples/qtconcurrent/CMakeLists.txt +++ b/examples/qtconcurrent/CMakeLists.txt @@ -1,15 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Concurrent) +if(NOT TARGET Qt6::Concurrent) return() endif() -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(imagescaling) qt_internal_add_example(progressdialog) qt_internal_add_example(runfunction) qt_internal_add_example(wordcount) endif() -if(TARGET Qt::Gui) +if(TARGET Qt6::Gui) qt_internal_add_example(map) endif() diff --git a/examples/qtconcurrent/imagescaling/CMakeLists.txt b/examples/qtconcurrent/imagescaling/CMakeLists.txt index 090f2674f2..24b0999b34 100644 --- a/examples/qtconcurrent/imagescaling/CMakeLists.txt +++ b/examples/qtconcurrent/imagescaling/CMakeLists.txt @@ -27,11 +27,11 @@ set_target_properties(imagescaling PROPERTIES ) target_link_libraries(imagescaling PUBLIC - Qt::Concurrent - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets + Qt6::Concurrent + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS imagescaling diff --git a/examples/qtconcurrent/map/CMakeLists.txt b/examples/qtconcurrent/map/CMakeLists.txt index a1d7700e72..c0739ca9af 100644 --- a/examples/qtconcurrent/map/CMakeLists.txt +++ b/examples/qtconcurrent/map/CMakeLists.txt @@ -19,9 +19,9 @@ qt_add_executable(mapdemo ) target_link_libraries(mapdemo PUBLIC - Qt::Concurrent - Qt::Core - Qt::Gui + Qt6::Concurrent + Qt6::Core + Qt6::Gui ) install(TARGETS mapdemo diff --git a/examples/qtconcurrent/progressdialog/CMakeLists.txt b/examples/qtconcurrent/progressdialog/CMakeLists.txt index 4711360a1f..a256227e63 100644 --- a/examples/qtconcurrent/progressdialog/CMakeLists.txt +++ b/examples/qtconcurrent/progressdialog/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(progressdialog PROPERTIES ) target_link_libraries(progressdialog PUBLIC - Qt::Concurrent - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Concurrent + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS progressdialog diff --git a/examples/qtconcurrent/runfunction/CMakeLists.txt b/examples/qtconcurrent/runfunction/CMakeLists.txt index 7bd50036f6..c2598a782b 100644 --- a/examples/qtconcurrent/runfunction/CMakeLists.txt +++ b/examples/qtconcurrent/runfunction/CMakeLists.txt @@ -19,10 +19,10 @@ qt_add_executable(runfunction ) target_link_libraries(runfunction PUBLIC - Qt::Concurrent - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Concurrent + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS runfunction diff --git a/examples/qtconcurrent/wordcount/CMakeLists.txt b/examples/qtconcurrent/wordcount/CMakeLists.txt index cd2dab3031..3221fa37ea 100644 --- a/examples/qtconcurrent/wordcount/CMakeLists.txt +++ b/examples/qtconcurrent/wordcount/CMakeLists.txt @@ -19,10 +19,10 @@ qt_add_executable(wordcount ) target_link_libraries(wordcount PUBLIC - Qt::Concurrent - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Concurrent + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS wordcount diff --git a/examples/qtestlib/CMakeLists.txt b/examples/qtestlib/CMakeLists.txt index f38b3d7637..3ce21c9bbd 100644 --- a/examples/qtestlib/CMakeLists.txt +++ b/examples/qtestlib/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Widgets) +if(NOT TARGET Qt6::Widgets) return() endif() qt_internal_add_example(tutorial1) diff --git a/examples/qtestlib/tutorial1/CMakeLists.txt b/examples/qtestlib/tutorial1/CMakeLists.txt index ce192425d5..29b2c5ccd5 100644 --- a/examples/qtestlib/tutorial1/CMakeLists.txt +++ b/examples/qtestlib/tutorial1/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(tutorial1 PROPERTIES ) target_link_libraries(tutorial1 PUBLIC - Qt::Core - Qt::Gui - Qt::Test - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Test + Qt6::Widgets ) install(TARGETS tutorial1 diff --git a/examples/qtestlib/tutorial2/CMakeLists.txt b/examples/qtestlib/tutorial2/CMakeLists.txt index 11272dc4db..f178ee39ea 100644 --- a/examples/qtestlib/tutorial2/CMakeLists.txt +++ b/examples/qtestlib/tutorial2/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(tutorial2 PROPERTIES ) target_link_libraries(tutorial2 PUBLIC - Qt::Core - Qt::Gui - Qt::Test - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Test + Qt6::Widgets ) install(TARGETS tutorial2 diff --git a/examples/qtestlib/tutorial3/CMakeLists.txt b/examples/qtestlib/tutorial3/CMakeLists.txt index 7575653639..318923fe98 100644 --- a/examples/qtestlib/tutorial3/CMakeLists.txt +++ b/examples/qtestlib/tutorial3/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(tutorial3 PROPERTIES ) target_link_libraries(tutorial3 PUBLIC - Qt::Core - Qt::Gui - Qt::Test - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Test + Qt6::Widgets ) install(TARGETS tutorial3 diff --git a/examples/qtestlib/tutorial4/CMakeLists.txt b/examples/qtestlib/tutorial4/CMakeLists.txt index 1663beb5ba..47f379d679 100644 --- a/examples/qtestlib/tutorial4/CMakeLists.txt +++ b/examples/qtestlib/tutorial4/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(tutorial4 PROPERTIES ) target_link_libraries(tutorial4 PUBLIC - Qt::Core - Qt::Gui - Qt::Test - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Test + Qt6::Widgets ) install(TARGETS tutorial4 diff --git a/examples/qtestlib/tutorial5/CMakeLists.txt b/examples/qtestlib/tutorial5/CMakeLists.txt index 9991e19706..0ef2c9b33b 100644 --- a/examples/qtestlib/tutorial5/CMakeLists.txt +++ b/examples/qtestlib/tutorial5/CMakeLists.txt @@ -24,10 +24,10 @@ set_target_properties(tutorial5 PROPERTIES ) target_link_libraries(tutorial5 PUBLIC - Qt::Core - Qt::Gui - Qt::Test - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Test + Qt6::Widgets ) install(TARGETS tutorial5 diff --git a/examples/sql/CMakeLists.txt b/examples/sql/CMakeLists.txt index 6d867f49dc..ce1014a06a 100644 --- a/examples/sql/CMakeLists.txt +++ b/examples/sql/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Widgets) +if(NOT TARGET Qt6::Widgets) return() endif() qt_internal_add_example(books) @@ -11,7 +11,7 @@ qt_internal_add_example(querymodel) qt_internal_add_example(relationaltablemodel) qt_internal_add_example(sqlwidgetmapper) qt_internal_add_example(tablemodel) -if(TARGET Qt::Xml) +if(TARGET Qt6::Xml) qt_internal_add_example(masterdetail) endif() diff --git a/examples/sql/books/CMakeLists.txt b/examples/sql/books/CMakeLists.txt index 522b64deb9..48c7db386c 100644 --- a/examples/sql/books/CMakeLists.txt +++ b/examples/sql/books/CMakeLists.txt @@ -28,10 +28,10 @@ set_target_properties(books PROPERTIES ) target_link_libraries(books PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Widgets ) # Resources: diff --git a/examples/sql/cachedtable/CMakeLists.txt b/examples/sql/cachedtable/CMakeLists.txt index 442d02e751..3a76b9677a 100644 --- a/examples/sql/cachedtable/CMakeLists.txt +++ b/examples/sql/cachedtable/CMakeLists.txt @@ -26,10 +26,10 @@ set_target_properties(cachedtable PROPERTIES ) target_link_libraries(cachedtable PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Widgets ) install(TARGETS cachedtable diff --git a/examples/sql/drilldown/CMakeLists.txt b/examples/sql/drilldown/CMakeLists.txt index 8483d52dbf..0bbed9d140 100644 --- a/examples/sql/drilldown/CMakeLists.txt +++ b/examples/sql/drilldown/CMakeLists.txt @@ -28,10 +28,10 @@ set_target_properties(drilldown PROPERTIES ) target_link_libraries(drilldown PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Widgets ) # Resources: diff --git a/examples/sql/masterdetail/CMakeLists.txt b/examples/sql/masterdetail/CMakeLists.txt index 5e7aa49307..346d7dc2c8 100644 --- a/examples/sql/masterdetail/CMakeLists.txt +++ b/examples/sql/masterdetail/CMakeLists.txt @@ -27,11 +27,11 @@ set_target_properties(masterdetail PROPERTIES ) target_link_libraries(masterdetail PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Widgets - Qt::Xml + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Widgets + Qt6::Xml ) # Resources: diff --git a/examples/sql/querymodel/CMakeLists.txt b/examples/sql/querymodel/CMakeLists.txt index 47fabb595a..84ea7e58ba 100644 --- a/examples/sql/querymodel/CMakeLists.txt +++ b/examples/sql/querymodel/CMakeLists.txt @@ -27,10 +27,10 @@ set_target_properties(querymodel PROPERTIES ) target_link_libraries(querymodel PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Widgets ) install(TARGETS querymodel diff --git a/examples/sql/relationaltablemodel/CMakeLists.txt b/examples/sql/relationaltablemodel/CMakeLists.txt index 8d91acbeaa..45f733c9e5 100644 --- a/examples/sql/relationaltablemodel/CMakeLists.txt +++ b/examples/sql/relationaltablemodel/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(relationaltablemodel PROPERTIES ) target_link_libraries(relationaltablemodel PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Widgets ) install(TARGETS relationaltablemodel diff --git a/examples/sql/sqlbrowser/CMakeLists.txt b/examples/sql/sqlbrowser/CMakeLists.txt index 081d856da2..615411ab14 100644 --- a/examples/sql/sqlbrowser/CMakeLists.txt +++ b/examples/sql/sqlbrowser/CMakeLists.txt @@ -31,10 +31,10 @@ set_target_properties(sqlbrowser PROPERTIES ) target_link_libraries(sqlbrowser PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Widgets ) install(TARGETS sqlbrowser diff --git a/examples/sql/sqlwidgetmapper/CMakeLists.txt b/examples/sql/sqlwidgetmapper/CMakeLists.txt index a8b1f9b3a8..bc154258a7 100644 --- a/examples/sql/sqlwidgetmapper/CMakeLists.txt +++ b/examples/sql/sqlwidgetmapper/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(sqlwidgetmapper PROPERTIES ) target_link_libraries(sqlwidgetmapper PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Widgets ) install(TARGETS sqlwidgetmapper diff --git a/examples/sql/tablemodel/CMakeLists.txt b/examples/sql/tablemodel/CMakeLists.txt index 1d176d3a78..f69156f057 100644 --- a/examples/sql/tablemodel/CMakeLists.txt +++ b/examples/sql/tablemodel/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(tablemodel PROPERTIES ) target_link_libraries(tablemodel PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Widgets ) install(TARGETS tablemodel diff --git a/examples/vulkan/CMakeLists.txt b/examples/vulkan/CMakeLists.txt index 28bf3ad9e7..e4a1af8e26 100644 --- a/examples/vulkan/CMakeLists.txt +++ b/examples/vulkan/CMakeLists.txt @@ -4,9 +4,9 @@ qt_internal_add_example(hellovulkanwindow) qt_internal_add_example(hellovulkantriangle) qt_internal_add_example(hellovulkantexture) -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(hellovulkanwidget) endif() -if(TARGET Qt::Concurrent AND TARGET Qt::Widgets) +if(TARGET Qt6::Concurrent AND TARGET Qt6::Widgets) qt_internal_add_example(hellovulkancubes) endif() diff --git a/examples/vulkan/hellovulkancubes/CMakeLists.txt b/examples/vulkan/hellovulkancubes/CMakeLists.txt index 6a21ae8ceb..ff187adb8f 100644 --- a/examples/vulkan/hellovulkancubes/CMakeLists.txt +++ b/examples/vulkan/hellovulkancubes/CMakeLists.txt @@ -30,10 +30,10 @@ set_target_properties(hellovulkancubes PROPERTIES ) target_link_libraries(hellovulkancubes PUBLIC - Qt::Concurrent - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Concurrent + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/vulkan/hellovulkantexture/CMakeLists.txt b/examples/vulkan/hellovulkantexture/CMakeLists.txt index 4ebeaea7b2..b7bd01278a 100644 --- a/examples/vulkan/hellovulkantexture/CMakeLists.txt +++ b/examples/vulkan/hellovulkantexture/CMakeLists.txt @@ -25,8 +25,8 @@ set_target_properties(hellovulkantexture PROPERTIES ) target_link_libraries(hellovulkantexture PUBLIC - Qt::Core - Qt::Gui + Qt6::Core + Qt6::Gui ) # Resources: diff --git a/examples/vulkan/hellovulkantriangle/CMakeLists.txt b/examples/vulkan/hellovulkantriangle/CMakeLists.txt index bb8c2f549d..43bc6652d1 100644 --- a/examples/vulkan/hellovulkantriangle/CMakeLists.txt +++ b/examples/vulkan/hellovulkantriangle/CMakeLists.txt @@ -25,8 +25,8 @@ set_target_properties(hellovulkantriangle PROPERTIES ) target_link_libraries(hellovulkantriangle PUBLIC - Qt::Core - Qt::Gui + Qt6::Core + Qt6::Gui ) # Resources: diff --git a/examples/vulkan/hellovulkanwidget/CMakeLists.txt b/examples/vulkan/hellovulkanwidget/CMakeLists.txt index 5e85f144dc..da5dcba97b 100644 --- a/examples/vulkan/hellovulkanwidget/CMakeLists.txt +++ b/examples/vulkan/hellovulkanwidget/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(hellovulkanwidget PROPERTIES ) target_link_libraries(hellovulkanwidget PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/vulkan/hellovulkanwindow/CMakeLists.txt b/examples/vulkan/hellovulkanwindow/CMakeLists.txt index 459cbccd5e..37cc242b53 100644 --- a/examples/vulkan/hellovulkanwindow/CMakeLists.txt +++ b/examples/vulkan/hellovulkanwindow/CMakeLists.txt @@ -25,8 +25,8 @@ set_target_properties(hellovulkanwindow PROPERTIES ) target_link_libraries(hellovulkanwindow PUBLIC - Qt::Core - Qt::Gui + Qt6::Core + Qt6::Gui ) install(TARGETS hellovulkanwindow diff --git a/examples/widgets/CMakeLists.txt b/examples/widgets/CMakeLists.txt index 020cb9719e..315865b841 100644 --- a/examples/widgets/CMakeLists.txt +++ b/examples/widgets/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Widgets) +if(NOT TARGET Qt6::Widgets) return() endif() if(QT_FEATURE_animation) @@ -28,6 +28,6 @@ endif() if(QT_FEATURE_cursor) add_subdirectory(mainwindows) endif() -if(QT_FEATURE_opengl AND TARGET Qt::Gui) +if(QT_FEATURE_opengl AND TARGET Qt6::Gui) qt_internal_add_example(windowcontainer) endif() diff --git a/examples/widgets/animation/easing/CMakeLists.txt b/examples/widgets/animation/easing/CMakeLists.txt index 3549ca73c2..ea108ab27a 100644 --- a/examples/widgets/animation/easing/CMakeLists.txt +++ b/examples/widgets/animation/easing/CMakeLists.txt @@ -28,9 +28,9 @@ set_target_properties(easing PROPERTIES ) target_link_libraries(easing PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/desktop/screenshot/CMakeLists.txt b/examples/widgets/desktop/screenshot/CMakeLists.txt index da6c858450..6f830ce98b 100644 --- a/examples/widgets/desktop/screenshot/CMakeLists.txt +++ b/examples/widgets/desktop/screenshot/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(screenshot PROPERTIES ) target_link_libraries(screenshot PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS screenshot diff --git a/examples/widgets/desktop/systray/CMakeLists.txt b/examples/widgets/desktop/systray/CMakeLists.txt index cb9b792278..69030df07e 100644 --- a/examples/widgets/desktop/systray/CMakeLists.txt +++ b/examples/widgets/desktop/systray/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(systray PROPERTIES ) target_link_libraries(systray PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/dialogs/CMakeLists.txt b/examples/widgets/dialogs/CMakeLists.txt index 0298fba4f7..bb966b485a 100644 --- a/examples/widgets/dialogs/CMakeLists.txt +++ b/examples/widgets/dialogs/CMakeLists.txt @@ -9,6 +9,6 @@ qt_internal_add_example(extension) qt_internal_add_example(findfiles) qt_internal_add_example(standarddialogs) qt_internal_add_example(tabdialog) -if(QT_FEATURE_wizard AND TARGET Qt::PrintSupport) +if(QT_FEATURE_wizard AND TARGET Qt6::PrintSupport) qt_internal_add_example(licensewizard) endif() diff --git a/examples/widgets/dialogs/classwizard/CMakeLists.txt b/examples/widgets/dialogs/classwizard/CMakeLists.txt index 54de6408f2..153394caa0 100644 --- a/examples/widgets/dialogs/classwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/classwizard/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(classwizard PROPERTIES ) target_link_libraries(classwizard PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/dialogs/extension/CMakeLists.txt b/examples/widgets/dialogs/extension/CMakeLists.txt index 96eab547c6..8a3b53781d 100644 --- a/examples/widgets/dialogs/extension/CMakeLists.txt +++ b/examples/widgets/dialogs/extension/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(extension PROPERTIES ) target_link_libraries(extension PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS extension diff --git a/examples/widgets/dialogs/findfiles/CMakeLists.txt b/examples/widgets/dialogs/findfiles/CMakeLists.txt index d1c70dc145..b4c3ef0f37 100644 --- a/examples/widgets/dialogs/findfiles/CMakeLists.txt +++ b/examples/widgets/dialogs/findfiles/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(findfiles PROPERTIES ) target_link_libraries(findfiles PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS findfiles diff --git a/examples/widgets/dialogs/licensewizard/CMakeLists.txt b/examples/widgets/dialogs/licensewizard/CMakeLists.txt index 5ba8321782..8a553b9dc5 100644 --- a/examples/widgets/dialogs/licensewizard/CMakeLists.txt +++ b/examples/widgets/dialogs/licensewizard/CMakeLists.txt @@ -25,10 +25,10 @@ set_target_properties(licensewizard PROPERTIES ) target_link_libraries(licensewizard PUBLIC - Qt::Core - Qt::Gui - Qt::PrintSupport - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::PrintSupport + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt index ea502e0657..772b22fbc2 100644 --- a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt +++ b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(standarddialogs PROPERTIES ) target_link_libraries(standarddialogs PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS standarddialogs diff --git a/examples/widgets/dialogs/tabdialog/CMakeLists.txt b/examples/widgets/dialogs/tabdialog/CMakeLists.txt index 27f6aa914d..b554c99e77 100644 --- a/examples/widgets/dialogs/tabdialog/CMakeLists.txt +++ b/examples/widgets/dialogs/tabdialog/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(tabdialog PROPERTIES ) target_link_libraries(tabdialog PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS tabdialog diff --git a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt index b2621da35c..a127e1ce0d 100644 --- a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(trivialwizard PROPERTIES ) target_link_libraries(trivialwizard PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS trivialwizard diff --git a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt index 5bb08a593e..1d24d1b6e0 100644 --- a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(draggableicons PROPERTIES ) target_link_libraries(draggableicons PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt index aae64b7e23..a9781c4045 100644 --- a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(draggabletext PROPERTIES ) target_link_libraries(draggabletext PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/draganddrop/dropsite/CMakeLists.txt b/examples/widgets/draganddrop/dropsite/CMakeLists.txt index 3fa7f2bb52..0cc80219b8 100644 --- a/examples/widgets/draganddrop/dropsite/CMakeLists.txt +++ b/examples/widgets/draganddrop/dropsite/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(dropsite PROPERTIES ) target_link_libraries(dropsite PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS dropsite diff --git a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt index 67dc549c4a..afff8848b1 100644 --- a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt +++ b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(fridgemagnets PROPERTIES ) target_link_libraries(fridgemagnets PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/draganddrop/puzzle/CMakeLists.txt b/examples/widgets/draganddrop/puzzle/CMakeLists.txt index a9231f3f9e..b281000776 100644 --- a/examples/widgets/draganddrop/puzzle/CMakeLists.txt +++ b/examples/widgets/draganddrop/puzzle/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(draganddrop_puzzle PROPERTIES ) target_link_libraries(draganddrop_puzzle PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/effects/blurpicker/CMakeLists.txt b/examples/widgets/effects/blurpicker/CMakeLists.txt index 4e4d404d2d..7a51e09c9c 100644 --- a/examples/widgets/effects/blurpicker/CMakeLists.txt +++ b/examples/widgets/effects/blurpicker/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(blurpicker PROPERTIES ) target_link_libraries(blurpicker PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/effects/fademessage/CMakeLists.txt b/examples/widgets/effects/fademessage/CMakeLists.txt index a5360dd197..5f271505e0 100644 --- a/examples/widgets/effects/fademessage/CMakeLists.txt +++ b/examples/widgets/effects/fademessage/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(fademessage PROPERTIES ) target_link_libraries(fademessage PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/gallery/CMakeLists.txt b/examples/widgets/gallery/CMakeLists.txt index 60a9dca662..782bdb0f56 100644 --- a/examples/widgets/gallery/CMakeLists.txt +++ b/examples/widgets/gallery/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(gallery PROPERTIES ) target_link_libraries(gallery PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS gallery diff --git a/examples/widgets/gestures/CMakeLists.txt b/examples/widgets/gestures/CMakeLists.txt index 9c58d0a3a2..c345cfed11 100644 --- a/examples/widgets/gestures/CMakeLists.txt +++ b/examples/widgets/gestures/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Widgets) +if(NOT TARGET Qt6::Widgets) return() endif() qt_internal_add_example(imagegestures) diff --git a/examples/widgets/gestures/imagegestures/CMakeLists.txt b/examples/widgets/gestures/imagegestures/CMakeLists.txt index c67355e1f1..71109cde10 100644 --- a/examples/widgets/gestures/imagegestures/CMakeLists.txt +++ b/examples/widgets/gestures/imagegestures/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(imagegestures PROPERTIES ) target_link_libraries(imagegestures PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS imagegestures diff --git a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt index 1e5f7c0929..f6996d1852 100644 --- a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(anchorlayout PROPERTIES ) target_link_libraries(anchorlayout PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS anchorlayout diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt index b09d18c6c0..8e885195f3 100644 --- a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt +++ b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(basicgraphicslayouts PROPERTIES ) target_link_libraries(basicgraphicslayouts PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/graphicsview/chip/CMakeLists.txt b/examples/widgets/graphicsview/chip/CMakeLists.txt index 96f80bfc7c..49243f9cab 100644 --- a/examples/widgets/graphicsview/chip/CMakeLists.txt +++ b/examples/widgets/graphicsview/chip/CMakeLists.txt @@ -30,9 +30,9 @@ set_target_properties(chip PROPERTIES ) target_link_libraries(chip PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: @@ -52,9 +52,9 @@ qt_add_resources(chip "images" ${images_resource_files} ) -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(chip PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt index 8f09a96bd3..c7c6854f97 100644 --- a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt +++ b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(collidingmice PROPERTIES ) target_link_libraries(collidingmice PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt index 3eb908fad3..23831cc23a 100644 --- a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt +++ b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt @@ -29,9 +29,9 @@ set_target_properties(diagramscene PROPERTIES ) target_link_libraries(diagramscene PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt index 834feae2b5..bf461ce19e 100644 --- a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt +++ b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(dragdroprobot PROPERTIES ) target_link_libraries(dragdroprobot PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt b/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt index 8e1ce46eb0..7c625d846c 100644 --- a/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt +++ b/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(elasticnodes PROPERTIES ) target_link_libraries(elasticnodes PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS elasticnodes diff --git a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt index e0c84c2e90..3e3b2cb83b 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt +++ b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(embeddeddialogs PROPERTIES ) target_link_libraries(embeddeddialogs PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/graphicsview/flowlayout/CMakeLists.txt b/examples/widgets/graphicsview/flowlayout/CMakeLists.txt index a0afadb181..f571eb0756 100644 --- a/examples/widgets/graphicsview/flowlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/flowlayout/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(graphicsview_flowlayout PROPERTIES ) target_link_libraries(graphicsview_flowlayout PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS graphicsview_flowlayout diff --git a/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt index 5f20c9c648..4f5434fd27 100644 --- a/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(simpleanchorlayout PROPERTIES ) target_link_libraries(simpleanchorlayout PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS simpleanchorlayout diff --git a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt index d83571a6f6..8e4737e78b 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(weatheranchorlayout PROPERTIES ) target_link_libraries(weatheranchorlayout PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/itemviews/CMakeLists.txt b/examples/widgets/itemviews/CMakeLists.txt index 04b50251e5..96af14b567 100644 --- a/examples/widgets/itemviews/CMakeLists.txt +++ b/examples/widgets/itemviews/CMakeLists.txt @@ -23,6 +23,6 @@ qt_internal_add_example(storageview) if(QT_FEATURE_draganddrop) qt_internal_add_example(puzzle) endif() -if(TARGET Qt::Xml) +if(TARGET Qt6::Xml) qt_internal_add_example(simpledommodel) endif() diff --git a/examples/widgets/itemviews/addressbook/CMakeLists.txt b/examples/widgets/itemviews/addressbook/CMakeLists.txt index 3667570531..0a95271745 100644 --- a/examples/widgets/itemviews/addressbook/CMakeLists.txt +++ b/examples/widgets/itemviews/addressbook/CMakeLists.txt @@ -29,9 +29,9 @@ set_target_properties(addressbook PROPERTIES ) target_link_libraries(addressbook PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS addressbook diff --git a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt index de80b7b471..5b7ab8107c 100644 --- a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt +++ b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(basicsortfiltermodel PROPERTIES ) target_link_libraries(basicsortfiltermodel PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS basicsortfiltermodel diff --git a/examples/widgets/itemviews/chart/CMakeLists.txt b/examples/widgets/itemviews/chart/CMakeLists.txt index c52929b696..d8d1f48655 100644 --- a/examples/widgets/itemviews/chart/CMakeLists.txt +++ b/examples/widgets/itemviews/chart/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(chart PROPERTIES ) target_link_libraries(chart PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt index 6df6bc51fb..13ea6cd5f8 100644 --- a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt +++ b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(coloreditorfactory PROPERTIES ) target_link_libraries(coloreditorfactory PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS coloreditorfactory diff --git a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt index a6c352d568..2fe69363f7 100644 --- a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt +++ b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(combowidgetmapper PROPERTIES ) target_link_libraries(combowidgetmapper PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS combowidgetmapper diff --git a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt index f9aa2a1bbf..463a46c731 100644 --- a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt +++ b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(customsortfiltermodel PROPERTIES ) target_link_libraries(customsortfiltermodel PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/itemviews/dirview/CMakeLists.txt b/examples/widgets/itemviews/dirview/CMakeLists.txt index 9754bff9a4..6641618339 100644 --- a/examples/widgets/itemviews/dirview/CMakeLists.txt +++ b/examples/widgets/itemviews/dirview/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(dirview PROPERTIES ) target_link_libraries(dirview PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS dirview diff --git a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt index 8d372dbe73..da030a0801 100644 --- a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt +++ b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt @@ -28,9 +28,9 @@ set_target_properties(editabletreemodel PROPERTIES ) target_link_libraries(editabletreemodel PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/itemviews/fetchmore/CMakeLists.txt b/examples/widgets/itemviews/fetchmore/CMakeLists.txt index 2abc71fc1e..c22c6fab57 100644 --- a/examples/widgets/itemviews/fetchmore/CMakeLists.txt +++ b/examples/widgets/itemviews/fetchmore/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(fetchmore PROPERTIES ) target_link_libraries(fetchmore PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS fetchmore diff --git a/examples/widgets/itemviews/flattreeview/CMakeLists.txt b/examples/widgets/itemviews/flattreeview/CMakeLists.txt index 23ce2882d2..e039c2a86e 100644 --- a/examples/widgets/itemviews/flattreeview/CMakeLists.txt +++ b/examples/widgets/itemviews/flattreeview/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(flattreeview PROPERTIES ) target_link_libraries(flattreeview PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS flattreeview diff --git a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt index 88b2de98e4..275b8318e2 100644 --- a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt +++ b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(frozencolumn PROPERTIES ) target_link_libraries(frozencolumn PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/itemviews/interview/CMakeLists.txt b/examples/widgets/itemviews/interview/CMakeLists.txt index 0bff4991c8..ad2353b756 100644 --- a/examples/widgets/itemviews/interview/CMakeLists.txt +++ b/examples/widgets/itemviews/interview/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(interview PROPERTIES ) target_link_libraries(interview PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/itemviews/pixelator/CMakeLists.txt b/examples/widgets/itemviews/pixelator/CMakeLists.txt index 6db3d92c93..ac01daef08 100644 --- a/examples/widgets/itemviews/pixelator/CMakeLists.txt +++ b/examples/widgets/itemviews/pixelator/CMakeLists.txt @@ -30,9 +30,9 @@ set_target_properties(pixelator PROPERTIES ) target_link_libraries(pixelator PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: @@ -47,9 +47,9 @@ qt_add_resources(pixelator "images" ${images_resource_files} ) -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(pixelator PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/itemviews/puzzle/CMakeLists.txt b/examples/widgets/itemviews/puzzle/CMakeLists.txt index dc0b9d8322..b8bfb62307 100644 --- a/examples/widgets/itemviews/puzzle/CMakeLists.txt +++ b/examples/widgets/itemviews/puzzle/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(itemviews_puzzle PROPERTIES ) target_link_libraries(itemviews_puzzle PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt index 1d63e36847..37708d6960 100644 --- a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt +++ b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt @@ -27,10 +27,10 @@ set_target_properties(simpledommodel PROPERTIES ) target_link_libraries(simpledommodel PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets - Qt::Xml + Qt6::Core + Qt6::Gui + Qt6::Widgets + Qt6::Xml ) install(TARGETS simpledommodel diff --git a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt index f2ea8ae785..2335435888 100644 --- a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt +++ b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(simpletreemodel PROPERTIES ) target_link_libraries(simpletreemodel PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt index 1564d8d3a1..64ad79c155 100644 --- a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt +++ b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(simplewidgetmapper PROPERTIES ) target_link_libraries(simplewidgetmapper PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS simplewidgetmapper diff --git a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt index 0c64cb378a..45ce8eebb1 100644 --- a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt +++ b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(spinboxdelegate PROPERTIES ) target_link_libraries(spinboxdelegate PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS spinboxdelegate diff --git a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt index b931ba4bd0..1a340a4c44 100644 --- a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt +++ b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt @@ -31,13 +31,13 @@ set_target_properties(spreadsheet PROPERTIES ) target_link_libraries(spreadsheet PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) -if (TARGET Qt::PrintSupport) - target_link_libraries(spreadsheet PUBLIC Qt::PrintSupport) +if (TARGET Qt6::PrintSupport) + target_link_libraries(spreadsheet PUBLIC Qt6::PrintSupport) endif() # Resources: @@ -52,9 +52,9 @@ qt_add_resources(spreadsheet "spreadsheet" ${spreadsheet_resource_files} ) -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(spreadsheet PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/itemviews/stardelegate/CMakeLists.txt b/examples/widgets/itemviews/stardelegate/CMakeLists.txt index 265b0186d5..ab5a77b1be 100644 --- a/examples/widgets/itemviews/stardelegate/CMakeLists.txt +++ b/examples/widgets/itemviews/stardelegate/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(stardelegate PROPERTIES ) target_link_libraries(stardelegate PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS stardelegate diff --git a/examples/widgets/itemviews/storageview/CMakeLists.txt b/examples/widgets/itemviews/storageview/CMakeLists.txt index b393b5b20f..81090f8ae5 100644 --- a/examples/widgets/itemviews/storageview/CMakeLists.txt +++ b/examples/widgets/itemviews/storageview/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(storageview PROPERTIES ) target_link_libraries(storageview PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS storageview diff --git a/examples/widgets/layouts/basiclayouts/CMakeLists.txt b/examples/widgets/layouts/basiclayouts/CMakeLists.txt index cf175a8204..b3c36cd4c5 100644 --- a/examples/widgets/layouts/basiclayouts/CMakeLists.txt +++ b/examples/widgets/layouts/basiclayouts/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(basiclayouts PROPERTIES ) target_link_libraries(basiclayouts PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS basiclayouts diff --git a/examples/widgets/layouts/borderlayout/CMakeLists.txt b/examples/widgets/layouts/borderlayout/CMakeLists.txt index aa76e7d1ec..0ca57e5575 100644 --- a/examples/widgets/layouts/borderlayout/CMakeLists.txt +++ b/examples/widgets/layouts/borderlayout/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(borderlayout PROPERTIES ) target_link_libraries(borderlayout PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS borderlayout diff --git a/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt b/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt index ad636576ce..005b764035 100644 --- a/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt +++ b/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(dynamiclayouts PROPERTIES ) target_link_libraries(dynamiclayouts PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS dynamiclayouts diff --git a/examples/widgets/layouts/flowlayout/CMakeLists.txt b/examples/widgets/layouts/flowlayout/CMakeLists.txt index b6b72c86c2..3eab12a7eb 100644 --- a/examples/widgets/layouts/flowlayout/CMakeLists.txt +++ b/examples/widgets/layouts/flowlayout/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(flowlayout PROPERTIES ) target_link_libraries(flowlayout PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS flowlayout diff --git a/examples/widgets/mainwindows/application/CMakeLists.txt b/examples/widgets/mainwindows/application/CMakeLists.txt index ab4216ec87..551794651c 100644 --- a/examples/widgets/mainwindows/application/CMakeLists.txt +++ b/examples/widgets/mainwindows/application/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(application PROPERTIES ) target_link_libraries(application PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt index d3b9394232..51b9d35da9 100644 --- a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt +++ b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt @@ -28,13 +28,13 @@ set_target_properties(dockwidgets PROPERTIES ) target_link_libraries(dockwidgets PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) -if (TARGET Qt::PrintSupport) - target_link_libraries(dockwidgets PUBLIC Qt::PrintSupport) +if (TARGET Qt6::PrintSupport) + target_link_libraries(dockwidgets PUBLIC Qt6::PrintSupport) endif() # Resources: @@ -52,9 +52,9 @@ qt_add_resources(dockwidgets "dockwidgets" ${dockwidgets_resource_files} ) -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(dockwidgets PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/mainwindows/mainwindow/CMakeLists.txt b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt index 6d1330884d..fadb55b9b7 100644 --- a/examples/widgets/mainwindows/mainwindow/CMakeLists.txt +++ b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(mainwindow PROPERTIES ) target_link_libraries(mainwindow PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/mainwindows/mdi/CMakeLists.txt b/examples/widgets/mainwindows/mdi/CMakeLists.txt index 3f327a3733..3efefae48e 100644 --- a/examples/widgets/mainwindows/mdi/CMakeLists.txt +++ b/examples/widgets/mainwindows/mdi/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(mdi PROPERTIES ) target_link_libraries(mdi PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/mainwindows/menus/CMakeLists.txt b/examples/widgets/mainwindows/menus/CMakeLists.txt index e2dc7a4df4..84224561a6 100644 --- a/examples/widgets/mainwindows/menus/CMakeLists.txt +++ b/examples/widgets/mainwindows/menus/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(menus PROPERTIES ) target_link_libraries(menus PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS menus diff --git a/examples/widgets/mainwindows/sdi/CMakeLists.txt b/examples/widgets/mainwindows/sdi/CMakeLists.txt index d2205f454a..196d5a2876 100644 --- a/examples/widgets/mainwindows/sdi/CMakeLists.txt +++ b/examples/widgets/mainwindows/sdi/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(sdi PROPERTIES ) target_link_libraries(sdi PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/painting/affine/CMakeLists.txt b/examples/widgets/painting/affine/CMakeLists.txt index c686da3ece..7fa9b58f78 100644 --- a/examples/widgets/painting/affine/CMakeLists.txt +++ b/examples/widgets/painting/affine/CMakeLists.txt @@ -37,9 +37,9 @@ if(NOT TARGET painting_shared::painting_shared) endif() target_link_libraries(affine PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets painting_shared::painting_shared ) @@ -111,7 +111,7 @@ qt_add_resources(affine "affine" #) #target_link_libraries(affine PUBLIC - #Qt::OpenGL + #Qt6::OpenGL #) #endif() diff --git a/examples/widgets/painting/basicdrawing/CMakeLists.txt b/examples/widgets/painting/basicdrawing/CMakeLists.txt index 92f9d39cfc..d960627da3 100644 --- a/examples/widgets/painting/basicdrawing/CMakeLists.txt +++ b/examples/widgets/painting/basicdrawing/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(basicdrawing PROPERTIES ) target_link_libraries(basicdrawing PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/painting/composition/CMakeLists.txt b/examples/widgets/painting/composition/CMakeLists.txt index 338f47addb..9ce249f086 100644 --- a/examples/widgets/painting/composition/CMakeLists.txt +++ b/examples/widgets/painting/composition/CMakeLists.txt @@ -37,9 +37,9 @@ if(NOT TARGET painting_shared::painting_shared) endif() target_link_libraries(composition PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets painting_shared::painting_shared ) @@ -112,7 +112,7 @@ qt_add_resources(composition "composition" #) #target_link_libraries(affine PUBLIC - #Qt::OpenGL + #Qt6::OpenGL #) #endif() diff --git a/examples/widgets/painting/concentriccircles/CMakeLists.txt b/examples/widgets/painting/concentriccircles/CMakeLists.txt index 74549cc9d7..eb9631e922 100644 --- a/examples/widgets/painting/concentriccircles/CMakeLists.txt +++ b/examples/widgets/painting/concentriccircles/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(concentriccircles PROPERTIES ) target_link_libraries(concentriccircles PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS concentriccircles diff --git a/examples/widgets/painting/deform/CMakeLists.txt b/examples/widgets/painting/deform/CMakeLists.txt index 9a37035f8e..4202cf27b0 100644 --- a/examples/widgets/painting/deform/CMakeLists.txt +++ b/examples/widgets/painting/deform/CMakeLists.txt @@ -37,9 +37,9 @@ if(NOT TARGET painting_shared::painting_shared) endif() target_link_libraries(deform PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets painting_shared::painting_shared ) @@ -110,7 +110,7 @@ qt_add_resources(deform "deform" #) #target_link_libraries(affine PUBLIC - #Qt::OpenGL + #Qt6::OpenGL #) #endif() diff --git a/examples/widgets/painting/fontsampler/CMakeLists.txt b/examples/widgets/painting/fontsampler/CMakeLists.txt index 5ed4176dd9..e60c0061b6 100644 --- a/examples/widgets/painting/fontsampler/CMakeLists.txt +++ b/examples/widgets/painting/fontsampler/CMakeLists.txt @@ -30,14 +30,14 @@ set_target_properties(fontsampler PROPERTIES ) target_link_libraries(fontsampler PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(fontsampler PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt index f45cee0a07..2b97247165 100644 --- a/examples/widgets/painting/gradients/CMakeLists.txt +++ b/examples/widgets/painting/gradients/CMakeLists.txt @@ -37,9 +37,9 @@ if(NOT TARGET painting_shared::painting_shared) endif() target_link_libraries(gradients PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets painting_shared::painting_shared ) @@ -110,7 +110,7 @@ qt_add_resources(gradients "gradients" #) #target_link_libraries(affine PUBLIC - #Qt::OpenGL + #Qt6::OpenGL #) #endif() diff --git a/examples/widgets/painting/imagecomposition/CMakeLists.txt b/examples/widgets/painting/imagecomposition/CMakeLists.txt index de53844afa..e32ecc9ee5 100644 --- a/examples/widgets/painting/imagecomposition/CMakeLists.txt +++ b/examples/widgets/painting/imagecomposition/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(imagecomposition PROPERTIES ) target_link_libraries(imagecomposition PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/painting/painterpaths/CMakeLists.txt b/examples/widgets/painting/painterpaths/CMakeLists.txt index f1a2b31898..2ab2e3ac35 100644 --- a/examples/widgets/painting/painterpaths/CMakeLists.txt +++ b/examples/widgets/painting/painterpaths/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(painterpaths PROPERTIES ) target_link_libraries(painterpaths PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) if(UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS) diff --git a/examples/widgets/painting/pathstroke/CMakeLists.txt b/examples/widgets/painting/pathstroke/CMakeLists.txt index 88e6a9285d..a7fc317772 100644 --- a/examples/widgets/painting/pathstroke/CMakeLists.txt +++ b/examples/widgets/painting/pathstroke/CMakeLists.txt @@ -37,9 +37,9 @@ if(NOT TARGET painting_shared::painting_shared) endif() target_link_libraries(pathstroke PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets painting_shared::painting_shared ) @@ -110,7 +110,7 @@ qt_add_resources(pathstroke "pathstroke" #) #target_link_libraries(affine PUBLIC - #Qt::OpenGL + #Qt6::OpenGL #) #endif() diff --git a/examples/widgets/painting/shared/CMakeLists.txt b/examples/widgets/painting/shared/CMakeLists.txt index 48fca30029..f3d6fd49de 100644 --- a/examples/widgets/painting/shared/CMakeLists.txt +++ b/examples/widgets/painting/shared/CMakeLists.txt @@ -11,16 +11,16 @@ target_sources(painting_shared PRIVATE ${moc_files} ) -target_link_libraries(painting_shared PUBLIC Qt::Widgets) +target_link_libraries(painting_shared PUBLIC Qt6::Widgets) target_include_directories(painting_shared PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") ## Scopes: ##################################################################### -if (TARGET Qt::OpenGL OR QT_FEATURE_opengles2) +if (TARGET Qt6::OpenGL OR QT_FEATURE_opengles2) target_compile_definitions(painting_shared PRIVATE QT_OPENGL_SUPPORT) target_link_libraries(painting_shared PUBLIC - Qt::OpenGL + Qt6::OpenGL ) qt6_wrap_cpp(moc_files_gl fbopaintdevice.h) # no automoc for OBJECT libs target_sources(painting_shared PRIVATE fbopaintdevice.cpp fbopaintdevice.h ${moc_files_gl}) diff --git a/examples/widgets/painting/transformations/CMakeLists.txt b/examples/widgets/painting/transformations/CMakeLists.txt index 26c2b1b21d..5f308f739d 100644 --- a/examples/widgets/painting/transformations/CMakeLists.txt +++ b/examples/widgets/painting/transformations/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(transformations PROPERTIES ) target_link_libraries(transformations PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS transformations diff --git a/examples/widgets/richtext/calendar/CMakeLists.txt b/examples/widgets/richtext/calendar/CMakeLists.txt index a66f002e3c..602b585cfb 100644 --- a/examples/widgets/richtext/calendar/CMakeLists.txt +++ b/examples/widgets/richtext/calendar/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(calendar PROPERTIES ) target_link_libraries(calendar PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS calendar diff --git a/examples/widgets/richtext/orderform/CMakeLists.txt b/examples/widgets/richtext/orderform/CMakeLists.txt index c47b93eac9..9a6500d240 100644 --- a/examples/widgets/richtext/orderform/CMakeLists.txt +++ b/examples/widgets/richtext/orderform/CMakeLists.txt @@ -26,14 +26,14 @@ set_target_properties(orderform PROPERTIES ) target_link_libraries(orderform PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(orderform PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt index 56c1991994..9f96fc8368 100644 --- a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt +++ b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(syntaxhighlighter PROPERTIES ) target_link_libraries(syntaxhighlighter PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS syntaxhighlighter diff --git a/examples/widgets/richtext/textedit/CMakeLists.txt b/examples/widgets/richtext/textedit/CMakeLists.txt index 504fe69233..2fa3f7c7a3 100644 --- a/examples/widgets/richtext/textedit/CMakeLists.txt +++ b/examples/widgets/richtext/textedit/CMakeLists.txt @@ -28,13 +28,13 @@ set_target_properties(textedit PROPERTIES ) target_link_libraries(textedit PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) -if (TARGET Qt::PrintSupport) - target_link_libraries(textedit PUBLIC Qt::PrintSupport) +if (TARGET Qt6::PrintSupport) + target_link_libraries(textedit PUBLIC Qt6::PrintSupport) endif() # Resources: @@ -98,9 +98,9 @@ qt_add_resources(textedit "textedit" ${textedit_resource_files} ) -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(textedit PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/scroller/graphicsview/CMakeLists.txt b/examples/widgets/scroller/graphicsview/CMakeLists.txt index 92d27394a4..6d8d41a8b2 100644 --- a/examples/widgets/scroller/graphicsview/CMakeLists.txt +++ b/examples/widgets/scroller/graphicsview/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(graphicsview PROPERTIES ) target_link_libraries(graphicsview PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS graphicsview diff --git a/examples/widgets/tools/completer/CMakeLists.txt b/examples/widgets/tools/completer/CMakeLists.txt index fe805ed943..5f7c03f104 100644 --- a/examples/widgets/tools/completer/CMakeLists.txt +++ b/examples/widgets/tools/completer/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(completer PROPERTIES ) target_link_libraries(completer PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/tools/customcompleter/CMakeLists.txt b/examples/widgets/tools/customcompleter/CMakeLists.txt index 82a3df1fa3..37b8d18c32 100644 --- a/examples/widgets/tools/customcompleter/CMakeLists.txt +++ b/examples/widgets/tools/customcompleter/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(customcompleter PROPERTIES ) target_link_libraries(customcompleter PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt b/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt index d238b5c1c0..728e6d4856 100644 --- a/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt +++ b/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt @@ -13,9 +13,9 @@ set_target_properties(echopluginwindow PROPERTIES ) target_link_libraries(echopluginwindow PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) if(NOT QT6_IS_SHARED_LIBS_BUILD) diff --git a/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt b/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt index f4ee5f87e7..243d653177 100644 --- a/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt +++ b/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt @@ -15,9 +15,9 @@ target_include_directories(echoplugin PUBLIC ) target_link_libraries(echoplugin PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS echoplugin diff --git a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt index 04b6bb16de..5ab3171284 100644 --- a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt @@ -15,7 +15,7 @@ set_target_properties(plugandpaint PROPERTIES ) target_link_libraries(plugandpaint PRIVATE - Qt::Widgets + Qt6::Widgets pnp_basictools ) diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt index f1ef16085e..77bb2fd1c2 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt @@ -12,7 +12,7 @@ target_include_directories(pnp_basictools PUBLIC ) target_link_libraries(pnp_basictools PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt index 17e71d4d29..6568de9bee 100644 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt @@ -15,9 +15,9 @@ target_include_directories(pnp_extrafilters PUBLIC ) target_link_libraries(pnp_extrafilters PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS pnp_extrafilters diff --git a/examples/widgets/tools/regularexpression/CMakeLists.txt b/examples/widgets/tools/regularexpression/CMakeLists.txt index d745a36b84..7049949ef7 100644 --- a/examples/widgets/tools/regularexpression/CMakeLists.txt +++ b/examples/widgets/tools/regularexpression/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(regularexpression PROPERTIES ) target_link_libraries(regularexpression PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/tools/settingseditor/CMakeLists.txt b/examples/widgets/tools/settingseditor/CMakeLists.txt index f45c61b350..e44395361d 100644 --- a/examples/widgets/tools/settingseditor/CMakeLists.txt +++ b/examples/widgets/tools/settingseditor/CMakeLists.txt @@ -28,9 +28,9 @@ set_target_properties(settingseditor PROPERTIES ) target_link_libraries(settingseditor PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS settingseditor diff --git a/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt b/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt index aa191b2827..41df10c578 100644 --- a/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt +++ b/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt @@ -12,9 +12,9 @@ set_target_properties(simplestyleplugin PROPERTIES ) target_link_libraries(simplestyleplugin PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS simplestyleplugin diff --git a/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt b/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt index be69b98e1c..3c1ac7670f 100644 --- a/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt +++ b/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt @@ -12,9 +12,9 @@ set_target_properties(styleplugin PROPERTIES ) target_link_libraries(styleplugin PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) if(NOT QT6_IS_SHARED_LIBS_BUILD) diff --git a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt index f4b27ea7a1..54ef9aac94 100644 --- a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt +++ b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(treemodelcompleter PROPERTIES ) target_link_libraries(treemodelcompleter PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/tools/undo/CMakeLists.txt b/examples/widgets/tools/undo/CMakeLists.txt index 80b7ccc4e7..17b6ee7931 100644 --- a/examples/widgets/tools/undo/CMakeLists.txt +++ b/examples/widgets/tools/undo/CMakeLists.txt @@ -30,9 +30,9 @@ set_target_properties(undo PROPERTIES ) target_link_libraries(undo PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/tools/undoframework/CMakeLists.txt b/examples/widgets/tools/undoframework/CMakeLists.txt index 6a20234c02..0dca360cb8 100644 --- a/examples/widgets/tools/undoframework/CMakeLists.txt +++ b/examples/widgets/tools/undoframework/CMakeLists.txt @@ -28,9 +28,9 @@ set_target_properties(undoframework PROPERTIES ) target_link_libraries(undoframework PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/touch/CMakeLists.txt b/examples/widgets/touch/CMakeLists.txt index 13efae441b..4cf7878963 100644 --- a/examples/widgets/touch/CMakeLists.txt +++ b/examples/widgets/touch/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(NOT TARGET Qt::Widgets) +if(NOT TARGET Qt6::Widgets) return() endif() qt_internal_add_example(pinchzoom) diff --git a/examples/widgets/touch/dials/CMakeLists.txt b/examples/widgets/touch/dials/CMakeLists.txt index 334c531478..736a69e6da 100644 --- a/examples/widgets/touch/dials/CMakeLists.txt +++ b/examples/widgets/touch/dials/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(dials PROPERTIES ) target_link_libraries(dials PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS dials diff --git a/examples/widgets/touch/fingerpaint/CMakeLists.txt b/examples/widgets/touch/fingerpaint/CMakeLists.txt index f7dc475fa4..96bd4ff4f9 100644 --- a/examples/widgets/touch/fingerpaint/CMakeLists.txt +++ b/examples/widgets/touch/fingerpaint/CMakeLists.txt @@ -29,18 +29,18 @@ set_target_properties(fingerpaint PROPERTIES ) target_link_libraries(fingerpaint PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) -if (TARGET Qt::PrintSupport) - target_link_libraries(fingerpaint PUBLIC Qt::PrintSupport) +if (TARGET Qt6::PrintSupport) + target_link_libraries(fingerpaint PUBLIC Qt6::PrintSupport) endif() -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(fingerpaint PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/touch/knobs/CMakeLists.txt b/examples/widgets/touch/knobs/CMakeLists.txt index f097f44a7f..a471ee971b 100644 --- a/examples/widgets/touch/knobs/CMakeLists.txt +++ b/examples/widgets/touch/knobs/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(knobs PROPERTIES ) target_link_libraries(knobs PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS knobs diff --git a/examples/widgets/touch/pinchzoom/CMakeLists.txt b/examples/widgets/touch/pinchzoom/CMakeLists.txt index 88f7e312d2..2bbc2dcd92 100644 --- a/examples/widgets/touch/pinchzoom/CMakeLists.txt +++ b/examples/widgets/touch/pinchzoom/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(pinchzoom PROPERTIES ) target_link_libraries(pinchzoom PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt index 87292f0eb6..3ca908fae4 100644 --- a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(part1 PROPERTIES ) target_link_libraries(part1 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS part1 diff --git a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt index 032af2a8e2..e5105cce9f 100644 --- a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(part2 PROPERTIES ) target_link_libraries(part2 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS part2 diff --git a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt index 941dff356f..3ade538fdc 100644 --- a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(part3 PROPERTIES ) target_link_libraries(part3 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS part3 diff --git a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt index 4f2b05dd1d..03719a6b3e 100644 --- a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(part4 PROPERTIES ) target_link_libraries(part4 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS part4 diff --git a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt index b1a1bc2cf2..be337be0e5 100644 --- a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(part5 PROPERTIES ) target_link_libraries(part5 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS part5 diff --git a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt index 3a2f1af699..1d377c7d8e 100644 --- a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(part6 PROPERTIES ) target_link_libraries(part6 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS part6 diff --git a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt index 0913e886d0..f2800933bb 100644 --- a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(part7 PROPERTIES ) target_link_libraries(part7 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS part7 diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt index df8c0b4b32..d256bd217d 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(getting_started_part1 PROPERTIES ) target_link_libraries(getting_started_part1 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS getting_started_part1 diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt index 09656718af..369ee1d2cd 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(getting_started_part2 PROPERTIES ) target_link_libraries(getting_started_part2 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS getting_started_part2 diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt index 0f9a732b36..f927040bf2 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(getting_started_part3 PROPERTIES ) target_link_libraries(getting_started_part3 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS getting_started_part3 diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt index 78a3f89945..8dd418c16e 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(getting_started_part4 PROPERTIES ) target_link_libraries(getting_started_part4 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS getting_started_part4 diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt index 37b40a6a49..a1d2fe64a6 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(getting_started_part5 PROPERTIES ) target_link_libraries(getting_started_part5 PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS getting_started_part5 diff --git a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt index f219f31096..d8c0399a99 100644 --- a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(mv_readonly PROPERTIES ) target_link_libraries(mv_readonly PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS mv_readonly diff --git a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt index 09c36f5fbb..187eace047 100644 --- a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(mv_formatting PROPERTIES ) target_link_libraries(mv_formatting PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS mv_formatting diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt index 80750a27c1..50c7f0ee6b 100644 --- a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(mv_changingmodel PROPERTIES ) target_link_libraries(mv_changingmodel PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS mv_changingmodel diff --git a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt index 49297961c4..7829e80847 100644 --- a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(mv_headers PROPERTIES ) target_link_libraries(mv_headers PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS mv_headers diff --git a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt index 8ea3ef342e..81bd5d9c03 100644 --- a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(mv_edit PROPERTIES ) target_link_libraries(mv_edit PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS mv_edit diff --git a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt index 11d5812433..d36e69bbc9 100644 --- a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(mv_tree PROPERTIES ) target_link_libraries(mv_tree PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS mv_tree diff --git a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt index 64235eda65..31223b9198 100644 --- a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(mv_selections PROPERTIES ) target_link_libraries(mv_selections PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS mv_selections diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt index 874ebd42f8..e3bc886ae5 100644 --- a/examples/widgets/tutorials/notepad/CMakeLists.txt +++ b/examples/widgets/tutorials/notepad/CMakeLists.txt @@ -29,9 +29,9 @@ set_target_properties(notepad PROPERTIES ) target_link_libraries(notepad PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: @@ -63,9 +63,9 @@ qt_add_resources(notepad "notepad" ${notepad_resource_files} ) -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(notepad PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt index cb20505729..4525e8abc1 100644 --- a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(childwidget PROPERTIES ) target_link_libraries(childwidget PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS childwidget diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt index 9dbe1539eb..663f846d1d 100644 --- a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(nestedlayouts PROPERTIES ) target_link_libraries(nestedlayouts PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS nestedlayouts diff --git a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt index de932e9f11..0ccffd5a2c 100644 --- a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(toplevel PROPERTIES ) target_link_libraries(toplevel PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS toplevel diff --git a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt index 52ab8554a4..4a4c85ccc5 100644 --- a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(windowlayout PROPERTIES ) target_link_libraries(windowlayout PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS windowlayout diff --git a/examples/widgets/widgets/analogclock/CMakeLists.txt b/examples/widgets/widgets/analogclock/CMakeLists.txt index 791d351302..1dd9a5b5e5 100644 --- a/examples/widgets/widgets/analogclock/CMakeLists.txt +++ b/examples/widgets/widgets/analogclock/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(analogclock PROPERTIES ) target_link_libraries(analogclock PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS analogclock diff --git a/examples/widgets/widgets/calculator/CMakeLists.txt b/examples/widgets/widgets/calculator/CMakeLists.txt index c75bcb36fe..809a15ebd1 100644 --- a/examples/widgets/widgets/calculator/CMakeLists.txt +++ b/examples/widgets/widgets/calculator/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(calculator PROPERTIES ) target_link_libraries(calculator PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS calculator diff --git a/examples/widgets/widgets/calendarwidget/CMakeLists.txt b/examples/widgets/widgets/calendarwidget/CMakeLists.txt index 0d850e4a09..433ff7ccf0 100644 --- a/examples/widgets/widgets/calendarwidget/CMakeLists.txt +++ b/examples/widgets/widgets/calendarwidget/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(calendarwidget PROPERTIES ) target_link_libraries(calendarwidget PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS calendarwidget diff --git a/examples/widgets/widgets/charactermap/CMakeLists.txt b/examples/widgets/widgets/charactermap/CMakeLists.txt index 9642e9f17e..ae151fa603 100644 --- a/examples/widgets/widgets/charactermap/CMakeLists.txt +++ b/examples/widgets/widgets/charactermap/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(charactermap PROPERTIES ) target_link_libraries(charactermap PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS charactermap diff --git a/examples/widgets/widgets/codeeditor/CMakeLists.txt b/examples/widgets/widgets/codeeditor/CMakeLists.txt index 31fb1b0718..5d4c17905f 100644 --- a/examples/widgets/widgets/codeeditor/CMakeLists.txt +++ b/examples/widgets/widgets/codeeditor/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(codeeditor PROPERTIES ) target_link_libraries(codeeditor PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS codeeditor diff --git a/examples/widgets/widgets/digitalclock/CMakeLists.txt b/examples/widgets/widgets/digitalclock/CMakeLists.txt index 43f0106add..fec6895f13 100644 --- a/examples/widgets/widgets/digitalclock/CMakeLists.txt +++ b/examples/widgets/widgets/digitalclock/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(digitalclock PROPERTIES ) target_link_libraries(digitalclock PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS digitalclock diff --git a/examples/widgets/widgets/elidedlabel/CMakeLists.txt b/examples/widgets/widgets/elidedlabel/CMakeLists.txt index c7e2f96aa7..28b950b492 100644 --- a/examples/widgets/widgets/elidedlabel/CMakeLists.txt +++ b/examples/widgets/widgets/elidedlabel/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(elidedlabel PROPERTIES ) target_link_libraries(elidedlabel PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS elidedlabel diff --git a/examples/widgets/widgets/groupbox/CMakeLists.txt b/examples/widgets/widgets/groupbox/CMakeLists.txt index 304b1fe083..b08e869a33 100644 --- a/examples/widgets/widgets/groupbox/CMakeLists.txt +++ b/examples/widgets/widgets/groupbox/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(groupbox PROPERTIES ) target_link_libraries(groupbox PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS groupbox diff --git a/examples/widgets/widgets/icons/CMakeLists.txt b/examples/widgets/widgets/icons/CMakeLists.txt index baede5b418..5a30b75a5a 100644 --- a/examples/widgets/widgets/icons/CMakeLists.txt +++ b/examples/widgets/widgets/icons/CMakeLists.txt @@ -32,9 +32,9 @@ target_compile_definitions(icons PUBLIC ) target_link_libraries(icons PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS icons diff --git a/examples/widgets/widgets/imageviewer/CMakeLists.txt b/examples/widgets/widgets/imageviewer/CMakeLists.txt index dffca22ced..30009e3710 100644 --- a/examples/widgets/widgets/imageviewer/CMakeLists.txt +++ b/examples/widgets/widgets/imageviewer/CMakeLists.txt @@ -28,18 +28,18 @@ set_target_properties(imageviewer PROPERTIES ) target_link_libraries(imageviewer PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) -if (TARGET Qt::PrintSupport) - target_link_libraries(imageviewer PUBLIC Qt::PrintSupport) +if (TARGET Qt6::PrintSupport) + target_link_libraries(imageviewer PUBLIC Qt6::PrintSupport) endif() -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(imageviewer PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/widgets/lineedits/CMakeLists.txt b/examples/widgets/widgets/lineedits/CMakeLists.txt index 988e82a534..97a79f2fe6 100644 --- a/examples/widgets/widgets/lineedits/CMakeLists.txt +++ b/examples/widgets/widgets/lineedits/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(lineedits PROPERTIES ) target_link_libraries(lineedits PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS lineedits diff --git a/examples/widgets/widgets/mousebuttons/CMakeLists.txt b/examples/widgets/widgets/mousebuttons/CMakeLists.txt index 79e7048eed..07c7ec1254 100644 --- a/examples/widgets/widgets/mousebuttons/CMakeLists.txt +++ b/examples/widgets/widgets/mousebuttons/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(mousebuttons PROPERTIES ) target_link_libraries(mousebuttons PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS mousebuttons diff --git a/examples/widgets/widgets/movie/CMakeLists.txt b/examples/widgets/widgets/movie/CMakeLists.txt index 89e2adb7da..3e67f9403a 100644 --- a/examples/widgets/widgets/movie/CMakeLists.txt +++ b/examples/widgets/widgets/movie/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(movie PROPERTIES ) target_link_libraries(movie PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS movie diff --git a/examples/widgets/widgets/scribble/CMakeLists.txt b/examples/widgets/widgets/scribble/CMakeLists.txt index 4efce5a0c1..3cf6bc9351 100644 --- a/examples/widgets/widgets/scribble/CMakeLists.txt +++ b/examples/widgets/widgets/scribble/CMakeLists.txt @@ -29,18 +29,18 @@ set_target_properties(scribble PROPERTIES ) target_link_libraries(scribble PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) -if (TARGET Qt::PrintSupport) - target_link_libraries(scribble PUBLIC Qt::PrintSupport) +if (TARGET Qt6::PrintSupport) + target_link_libraries(scribble PUBLIC Qt6::PrintSupport) endif() -if(TARGET Qt::PrintSupport) +if(TARGET Qt6::PrintSupport) target_link_libraries(scribble PUBLIC - Qt::PrintSupport + Qt6::PrintSupport ) endif() diff --git a/examples/widgets/widgets/shapedclock/CMakeLists.txt b/examples/widgets/widgets/shapedclock/CMakeLists.txt index c0cd5eac8c..2d594598a2 100644 --- a/examples/widgets/widgets/shapedclock/CMakeLists.txt +++ b/examples/widgets/widgets/shapedclock/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(shapedclock PROPERTIES ) target_link_libraries(shapedclock PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS shapedclock diff --git a/examples/widgets/widgets/shortcuteditor/CMakeLists.txt b/examples/widgets/widgets/shortcuteditor/CMakeLists.txt index 941cffbb09..a3bc135b32 100644 --- a/examples/widgets/widgets/shortcuteditor/CMakeLists.txt +++ b/examples/widgets/widgets/shortcuteditor/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(shortcuteditor PROPERTIES ) target_link_libraries(shortcuteditor PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS shortcuteditor diff --git a/examples/widgets/widgets/sliders/CMakeLists.txt b/examples/widgets/widgets/sliders/CMakeLists.txt index 4a1dea7496..fb0373aa95 100644 --- a/examples/widgets/widgets/sliders/CMakeLists.txt +++ b/examples/widgets/widgets/sliders/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(sliders PROPERTIES ) target_link_libraries(sliders PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS sliders diff --git a/examples/widgets/widgets/spinboxes/CMakeLists.txt b/examples/widgets/widgets/spinboxes/CMakeLists.txt index add7c5ea2f..21209b854e 100644 --- a/examples/widgets/widgets/spinboxes/CMakeLists.txt +++ b/examples/widgets/widgets/spinboxes/CMakeLists.txt @@ -25,9 +25,9 @@ set_target_properties(spinboxes PROPERTIES ) target_link_libraries(spinboxes PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS spinboxes diff --git a/examples/widgets/widgets/styles/CMakeLists.txt b/examples/widgets/widgets/styles/CMakeLists.txt index 502e5b8672..8dbcc28e6f 100644 --- a/examples/widgets/widgets/styles/CMakeLists.txt +++ b/examples/widgets/widgets/styles/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(styles PROPERTIES ) target_link_libraries(styles PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/widgets/stylesheet/CMakeLists.txt b/examples/widgets/widgets/stylesheet/CMakeLists.txt index f75e5a4a52..5c817461d5 100644 --- a/examples/widgets/widgets/stylesheet/CMakeLists.txt +++ b/examples/widgets/widgets/stylesheet/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(stylesheet PROPERTIES ) target_link_libraries(stylesheet PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/widgets/tablet/CMakeLists.txt b/examples/widgets/widgets/tablet/CMakeLists.txt index bb1d76f2fb..cb02137856 100644 --- a/examples/widgets/widgets/tablet/CMakeLists.txt +++ b/examples/widgets/widgets/tablet/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(qttablet PROPERTIES ) target_link_libraries(qttablet PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/widgets/tetrix/CMakeLists.txt b/examples/widgets/widgets/tetrix/CMakeLists.txt index 4320cef400..378b99a90e 100644 --- a/examples/widgets/widgets/tetrix/CMakeLists.txt +++ b/examples/widgets/widgets/tetrix/CMakeLists.txt @@ -27,9 +27,9 @@ set_target_properties(tetrix PROPERTIES ) target_link_libraries(tetrix PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS tetrix diff --git a/examples/widgets/widgets/tooltips/CMakeLists.txt b/examples/widgets/widgets/tooltips/CMakeLists.txt index 7e1e0fbf1c..d912982470 100644 --- a/examples/widgets/widgets/tooltips/CMakeLists.txt +++ b/examples/widgets/widgets/tooltips/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(tooltips PROPERTIES ) target_link_libraries(tooltips PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/widgets/validators/CMakeLists.txt b/examples/widgets/widgets/validators/CMakeLists.txt index ca034a8709..e4c80ef7a7 100644 --- a/examples/widgets/widgets/validators/CMakeLists.txt +++ b/examples/widgets/widgets/validators/CMakeLists.txt @@ -31,9 +31,9 @@ set_target_properties(validators PROPERTIES ) target_link_libraries(validators PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: diff --git a/examples/widgets/widgets/wiggly/CMakeLists.txt b/examples/widgets/widgets/wiggly/CMakeLists.txt index 1f39e94cb1..6f62eafd7a 100644 --- a/examples/widgets/widgets/wiggly/CMakeLists.txt +++ b/examples/widgets/widgets/wiggly/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(wiggly PROPERTIES ) target_link_libraries(wiggly PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS wiggly diff --git a/examples/widgets/widgets/windowflags/CMakeLists.txt b/examples/widgets/widgets/windowflags/CMakeLists.txt index 379270ef87..6b7c6afc34 100644 --- a/examples/widgets/widgets/windowflags/CMakeLists.txt +++ b/examples/widgets/widgets/windowflags/CMakeLists.txt @@ -26,9 +26,9 @@ set_target_properties(windowflags PROPERTIES ) target_link_libraries(windowflags PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS windowflags diff --git a/examples/widgets/windowcontainer/CMakeLists.txt b/examples/widgets/windowcontainer/CMakeLists.txt index 90bdc67a62..fc2a020c11 100644 --- a/examples/widgets/windowcontainer/CMakeLists.txt +++ b/examples/widgets/windowcontainer/CMakeLists.txt @@ -29,10 +29,10 @@ target_include_directories(windowcontainer PUBLIC ) target_link_libraries(windowcontainer PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::OpenGL + Qt6::Widgets ) install(TARGETS windowcontainer diff --git a/examples/xml/CMakeLists.txt b/examples/xml/CMakeLists.txt index bf2ad14e56..f9dadb1455 100644 --- a/examples/xml/CMakeLists.txt +++ b/examples/xml/CMakeLists.txt @@ -3,10 +3,10 @@ qt_internal_add_example(htmlinfo) qt_internal_add_example(xmlstreamlint) -if(TARGET Qt::Widgets) +if(TARGET Qt6::Widgets) qt_internal_add_example(dombookmarks) qt_internal_add_example(streambookmarks) endif() -if(TARGET Qt::Network AND TARGET Qt::Widgets) +if(TARGET Qt6::Network AND TARGET Qt6::Widgets) qt_internal_add_example(rsslisting) endif() diff --git a/examples/xml/dombookmarks/CMakeLists.txt b/examples/xml/dombookmarks/CMakeLists.txt index 5d94dc6131..38398bbaa5 100644 --- a/examples/xml/dombookmarks/CMakeLists.txt +++ b/examples/xml/dombookmarks/CMakeLists.txt @@ -26,10 +26,10 @@ set_target_properties(dombookmarks PROPERTIES ) target_link_libraries(dombookmarks PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets - Qt::Xml + Qt6::Core + Qt6::Gui + Qt6::Widgets + Qt6::Xml ) install(TARGETS dombookmarks diff --git a/examples/xml/htmlinfo/CMakeLists.txt b/examples/xml/htmlinfo/CMakeLists.txt index 3035a3846e..2a9925f4d8 100644 --- a/examples/xml/htmlinfo/CMakeLists.txt +++ b/examples/xml/htmlinfo/CMakeLists.txt @@ -24,7 +24,7 @@ set_target_properties(htmlinfo PROPERTIES ) target_link_libraries(htmlinfo PUBLIC - Qt::Core + Qt6::Core ) # Resources: diff --git a/examples/xml/rsslisting/CMakeLists.txt b/examples/xml/rsslisting/CMakeLists.txt index 025978437b..6a6ea973e5 100644 --- a/examples/xml/rsslisting/CMakeLists.txt +++ b/examples/xml/rsslisting/CMakeLists.txt @@ -25,11 +25,11 @@ set_target_properties(rsslisting PROPERTIES ) target_link_libraries(rsslisting PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets - Qt::Xml + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets + Qt6::Xml ) install(TARGETS rsslisting diff --git a/examples/xml/streambookmarks/CMakeLists.txt b/examples/xml/streambookmarks/CMakeLists.txt index beb1eb26d5..bea45d766c 100644 --- a/examples/xml/streambookmarks/CMakeLists.txt +++ b/examples/xml/streambookmarks/CMakeLists.txt @@ -27,10 +27,10 @@ set_target_properties(streambookmarks PROPERTIES ) target_link_libraries(streambookmarks PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets - Qt::Xml + Qt6::Core + Qt6::Gui + Qt6::Widgets + Qt6::Xml ) install(TARGETS streambookmarks diff --git a/examples/xml/xmlstreamlint/CMakeLists.txt b/examples/xml/xmlstreamlint/CMakeLists.txt index 1a29901e0b..2b0a2a908f 100644 --- a/examples/xml/xmlstreamlint/CMakeLists.txt +++ b/examples/xml/xmlstreamlint/CMakeLists.txt @@ -24,8 +24,8 @@ set_target_properties(xmlstreamlint PROPERTIES ) target_link_libraries(xmlstreamlint PUBLIC - Qt::Core - Qt::Xml + Qt6::Core + Qt6::Xml ) install(TARGETS xmlstreamlint -- cgit v1.2.3