diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 12:59:07 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 16:31:09 +0200 |
commit | fe3bd212fc85b6c3a64bb8bd5beca4ff4d3493a1 (patch) | |
tree | b96dd84abfb6ac25b26539999bf2d7d427f347dd /examples/network | |
parent | 72066a3a585b4f4fed499c64464ca5ad2ba9f71d (diff) | |
parent | ae97d11589dd03edeea0475163e6110869143b35 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
This changes many different CMake places to mention Qt6 instead of
Qt5.
Note that some old qt5 cmake config files in corelib are probably not
needed anymore, but I still renamed and kept them for now.
Change-Id: Ie69e81540386a5af153f76c0242e18d48211bec4
Diffstat (limited to 'examples/network')
23 files changed, 48 insertions, 48 deletions
diff --git a/examples/network/bearermonitor/CMakeLists.txt b/examples/network/bearermonitor/CMakeLists.txt index 8cb67e13b6..eb992a0c58 100644 --- a/examples/network/bearermonitor/CMakeLists.txt +++ b/examples/network/bearermonitor/CMakeLists.txt @@ -11,10 +11,10 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Core) -find_package(Qt5 COMPONENTS Gui) -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_executable(bearermonitor bearermonitor.cpp bearermonitor.h diff --git a/examples/network/blockingfortuneclient/CMakeLists.txt b/examples/network/blockingfortuneclient/CMakeLists.txt index f79e15cb59..14e15f9e13 100644 --- a/examples/network/blockingfortuneclient/CMakeLists.txt +++ b/examples/network/blockingfortuneclient/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(blockingfortuneclient blockingclient.cpp blockingclient.h diff --git a/examples/network/broadcastreceiver/CMakeLists.txt b/examples/network/broadcastreceiver/CMakeLists.txt index 05074f6d91..ad1f9823d4 100644 --- a/examples/network/broadcastreceiver/CMakeLists.txt +++ b/examples/network/broadcastreceiver/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(broadcastreceiver main.cpp diff --git a/examples/network/broadcastsender/CMakeLists.txt b/examples/network/broadcastsender/CMakeLists.txt index 323ea5e9cb..b823046396 100644 --- a/examples/network/broadcastsender/CMakeLists.txt +++ b/examples/network/broadcastsender/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(broadcastsender main.cpp diff --git a/examples/network/dnslookup/CMakeLists.txt b/examples/network/dnslookup/CMakeLists.txt index b79445370b..bc0bb4d1eb 100644 --- a/examples/network/dnslookup/CMakeLists.txt +++ b/examples/network/dnslookup/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Core) -find_package(Qt5 COMPONENTS Network) +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Network) add_executable(dnslookup dnslookup.cpp dnslookup.h diff --git a/examples/network/download/CMakeLists.txt b/examples/network/download/CMakeLists.txt index 2b48217c38..462bf30554 100644 --- a/examples/network/download/CMakeLists.txt +++ b/examples/network/download/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Core) -find_package(Qt5 COMPONENTS Network) +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Network) add_executable(download main.cpp diff --git a/examples/network/downloadmanager/CMakeLists.txt b/examples/network/downloadmanager/CMakeLists.txt index b8eb8db400..09d1db51d0 100644 --- a/examples/network/downloadmanager/CMakeLists.txt +++ b/examples/network/downloadmanager/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Core) -find_package(Qt5 COMPONENTS Network) +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Network) add_executable(downloadmanager downloadmanager.cpp downloadmanager.h diff --git a/examples/network/fortuneclient/CMakeLists.txt b/examples/network/fortuneclient/CMakeLists.txt index 0169b4eb4c..7af88e9626 100644 --- a/examples/network/fortuneclient/CMakeLists.txt +++ b/examples/network/fortuneclient/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(fortuneclient client.cpp client.h diff --git a/examples/network/fortuneserver/CMakeLists.txt b/examples/network/fortuneserver/CMakeLists.txt index fb2a681413..19897104e0 100644 --- a/examples/network/fortuneserver/CMakeLists.txt +++ b/examples/network/fortuneserver/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(fortuneserver main.cpp diff --git a/examples/network/googlesuggest/CMakeLists.txt b/examples/network/googlesuggest/CMakeLists.txt index f0f7f14378..5a6a52ce33 100644 --- a/examples/network/googlesuggest/CMakeLists.txt +++ b/examples/network/googlesuggest/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(googlesuggest googlesuggest.cpp googlesuggest.h diff --git a/examples/network/http/CMakeLists.txt b/examples/network/http/CMakeLists.txt index 890f2891a2..2e00f20635 100644 --- a/examples/network/http/CMakeLists.txt +++ b/examples/network/http/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(http authenticationdialog.ui diff --git a/examples/network/loopback/CMakeLists.txt b/examples/network/loopback/CMakeLists.txt index 4e4e265edd..233ff460e3 100644 --- a/examples/network/loopback/CMakeLists.txt +++ b/examples/network/loopback/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(loopback dialog.cpp dialog.h diff --git a/examples/network/multicastreceiver/CMakeLists.txt b/examples/network/multicastreceiver/CMakeLists.txt index 19a062aff3..8073c9fb7e 100644 --- a/examples/network/multicastreceiver/CMakeLists.txt +++ b/examples/network/multicastreceiver/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(multicastreceiver main.cpp diff --git a/examples/network/multicastsender/CMakeLists.txt b/examples/network/multicastsender/CMakeLists.txt index ba4386963e..062c942b35 100644 --- a/examples/network/multicastsender/CMakeLists.txt +++ b/examples/network/multicastsender/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(multicastsender main.cpp diff --git a/examples/network/multistreamclient/CMakeLists.txt b/examples/network/multistreamclient/CMakeLists.txt index efb4c7bf35..617e556cff 100644 --- a/examples/network/multistreamclient/CMakeLists.txt +++ b/examples/network/multistreamclient/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(multistreamclient chatconsumer.cpp chatconsumer.h diff --git a/examples/network/multistreamserver/CMakeLists.txt b/examples/network/multistreamserver/CMakeLists.txt index 88aefc9af0..3564e370d7 100644 --- a/examples/network/multistreamserver/CMakeLists.txt +++ b/examples/network/multistreamserver/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(multistreamserver chatprovider.cpp chatprovider.h diff --git a/examples/network/network-chat/CMakeLists.txt b/examples/network/network-chat/CMakeLists.txt index c3cbf32d9f..eb836df8c9 100644 --- a/examples/network/network-chat/CMakeLists.txt +++ b/examples/network/network-chat/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(network-chat chatdialog.cpp chatdialog.h chatdialog.ui diff --git a/examples/network/securesocketclient/CMakeLists.txt b/examples/network/securesocketclient/CMakeLists.txt index d514d21508..d83bd5f284 100644 --- a/examples/network/securesocketclient/CMakeLists.txt +++ b/examples/network/securesocketclient/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(securesocketclient certificateinfo.cpp certificateinfo.h certificateinfo.ui diff --git a/examples/network/secureudpclient/CMakeLists.txt b/examples/network/secureudpclient/CMakeLists.txt index 08854bd334..385918a61b 100644 --- a/examples/network/secureudpclient/CMakeLists.txt +++ b/examples/network/secureudpclient/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) add_qt_gui_executable(secureudpclient addressdialog.cpp addressdialog.h addressdialog.ui diff --git a/examples/network/secureudpserver/CMakeLists.txt b/examples/network/secureudpserver/CMakeLists.txt index e991c9822c..28d01df849 100644 --- a/examples/network/secureudpserver/CMakeLists.txt +++ b/examples/network/secureudpserver/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) add_qt_gui_executable(secureudpserver main.cpp diff --git a/examples/network/threadedfortuneserver/CMakeLists.txt b/examples/network/threadedfortuneserver/CMakeLists.txt index 4e5f61ceca..35372da369 100644 --- a/examples/network/threadedfortuneserver/CMakeLists.txt +++ b/examples/network/threadedfortuneserver/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(threadedfortuneserver dialog.cpp dialog.h diff --git a/examples/network/torrent/.prev_CMakeLists.txt b/examples/network/torrent/.prev_CMakeLists.txt index 3ed78c7e3b..8c294427f7 100644 --- a/examples/network/torrent/.prev_CMakeLists.txt +++ b/examples/network/torrent/.prev_CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(torrent addtorrentdialog.cpp addtorrentdialog.h diff --git a/examples/network/torrent/CMakeLists.txt b/examples/network/torrent/CMakeLists.txt index 205b1b4527..9398369064 100644 --- a/examples/network/torrent/CMakeLists.txt +++ b/examples/network/torrent/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(torrent addtorrentdialog.cpp addtorrentdialog.h |