1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Browse Source 
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
This commit is contained in:
Alexandru Croitor 2019-06-14 12:59:07 +02:00
commit fe3bd212fc
431 changed files with 2918 additions and 2356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.qmake.conf
View File

@ -4,4 +4,4 @@ CONFIG += warning_clean
QT_SOURCE_TREE = $$PWD
QT_BUILD_TREE = $$shadowed($$PWD)
MODULE_VERSION = 5.14.0
MODULE_VERSION = 6.0.0

2
CMakeLists.txt
View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.15.0)
project(QtBase
VERSION 5.14.0
VERSION 6.0.0
DESCRIPTION "Qt Base Libraries"
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C ASM

4
cmake/QtBaseGlobalTargets.cmake
View File

@ -21,7 +21,7 @@ set(__GlobalConfig_path_suffix "${INSTALL_CMAKE_NAMESPACE}")
qt_path_join(__GlobalConfig_build_dir ${QT_CONFIG_BUILD_DIR} ${__GlobalConfig_path_suffix})
qt_path_join(__GlobalConfig_install_dir ${QT_CONFIG_INSTALL_DIR} ${__GlobalConfig_path_suffix})
# Generate and install Qt5 config file.
# Generate and install Qt6 config file.
configure_package_config_file(
"${PROJECT_SOURCE_DIR}/cmake/QtConfig.cmake.in"
"${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}Config.cmake"
@ -34,7 +34,7 @@ write_basic_package_version_file(
COMPATIBILITY AnyNewerVersion
)
# Generate and install Qt5Tools config file.
# Generate and install Qt6Tools config file.
configure_package_config_file(
"${PROJECT_SOURCE_DIR}/cmake/QtToolsConfig.cmake.in"
"${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ToolsConfig.cmake"

14
cmake/QtBuild.cmake
View File

@ -675,7 +675,7 @@ endfunction()
# When doing qt_internal_module_info(foo Core) this method will set
# the following variables in the caller's scope:
# * foo with the value "QtCore"
# * foo_versioned with the value "Qt5Core" (based on major Qt version)
# * foo_versioned with the value "Qt6Core" (based on major Qt version)
# * foo_upper with the value "CORE"
# * foo_lower with the value "core"
# * foo_include_dir with the module's include directory in the binary tree
@ -775,7 +775,7 @@ function(qt_register_target_dependencies target public_libs private_libs)
OR lib STREQUAL PlatformModuleInternal
OR lib STREQUAL PlatformPluginInternal
OR lib STREQUAL PlatformToolInternal)
list(APPEND target_deps "Qt5\;${PROJECT_VERSION}")
list(APPEND target_deps "Qt6\;${PROJECT_VERSION}")
elseif ("${lib}" MATCHES "(.*)Private")
list(APPEND target_deps "${INSTALL_CMAKE_NAMESPACE}${CMAKE_MATCH_1}\;${PROJECT_VERSION}")
else()
@ -1250,8 +1250,8 @@ function(add_qt_module target)
if(target STREQUAL Core)
# Propagate non-build related variables that are needed for consuming Qt packages.
# Do this in CoreConfig instead of Qt5Config, so that consumers can also use
# find_package(Qt5Core) instead of find_package(Qt5 COMPONENTS Core)
# Do this in CoreConfig instead of Qt6Config, so that consumers can also use
# find_package(Qt6Core) instead of find_package(Qt6 COMPONENTS Core)
string(APPEND extra_cmake_code "
set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
endif()
@ -1718,7 +1718,7 @@ function(add_qt_tool name)
endif()
if(arg_TOOLS_TARGET AND NOT QT_WILL_BUILD_TOOLS)
set(tools_package_name "Qt5${arg_TOOLS_TARGET}Tools")
set(tools_package_name "Qt6${arg_TOOLS_TARGET}Tools")
message(STATUS "Searching for tool '${full_name}' in package ${tools_package_name}.")
# Only search in path provided by QT_HOST_PATH. We need to do it with CMAKE_PREFIX_PATH
@ -1728,7 +1728,7 @@ function(add_qt_tool name)
set(CMAKE_PREFIX_PATH "${QT_HOST_PATH}")
# Search both with sysroots prepended as well as in the host system. When cross compiling
# the mode_package might be set to ONLY only, and the Qt5 tools packages are actually
# the mode_package might be set to ONLY only, and the Qt6 tools packages are actually
# in the host system.
set(BACKUP_CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${CMAKE_FIND_ROOT_PATH_MODE_PACKAGE})
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE "BOTH")
@ -1944,7 +1944,7 @@ function(add_qt_simd_part target)
endif()
endfunction()
# From Qt5CoreMacros
# From Qt6CoreMacros
# Function used to create the names of output files preserving relative dirs
function(qt_make_output_file infile prefix suffix source_dir binary_dir result)
get_filename_component(outfilename "${infile}" NAME_WE)

2
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
View File

@ -73,7 +73,7 @@ macro(qt_build_repo)
# Do this before adding src, because there might be test related conditions
# in source.
if (BUILD_TESTING)
find_package(Qt5 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Test)
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Test)
endif()
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists.txt")

2
cmake/QtConfig.cmake.in
View File

@ -1,6 +1,6 @@
@PACKAGE_INIT@
# Slightly amended version of ./src/corelib/Qt5Config.cmake.in
# Slightly amended version of ./src/corelib/Qt6Config.cmake.in
if (CMAKE_VERSION VERSION_LESS 3.1.0)
message(FATAL_ERROR "Qt requires at least CMake version 3.1.0")
endif()

2
cmake/QtModuleDependencies.cmake.in
View File

@ -46,7 +46,7 @@ foreach(_target_dep ${_tool_deps})
endif()
endforeach()
# note: target_deps example: "Qt5Core\;5.12.0;Qt5Gui\;5.12.0"
# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
set(_target_deps "@target_deps@")
foreach(_target_dep ${_target_deps})
list(GET _target_dep 0 pkg)

4
cmake/QtPlatformAndroid.cmake
View File

@ -162,12 +162,12 @@ function(qt_android_generate_deployment_settings target)
# Host Qt Android install path
if (NOT QT_BUILDING_QT)
set(file_check "${Qt5_DIR}/plugins/platforms/android/libqtforandroid.so")
set(file_check "${Qt6_DIR}/plugins/platforms/android/libqtforandroid.so")
if (NOT EXISTS ${file_check})
message(SEND_ERROR "Detected Qt installation does not contain libqtforandroid.so. This is most likely due to the installation not being a build of Qt for Android. Please update your settings.")
return()
endif()
set(qt_android_install_dir ${Qt5_Dir})
set(qt_android_install_dir ${Qt6_Dir})
else()
# Building from source, use the same install prefix
set(qt_android_install_dir ${CMAKE_INSTALL_PREFIX})

2
cmake/QtPluginDependencies.cmake.in
View File

@ -34,7 +34,7 @@ endforeach()
# Restore old module path.
set(CMAKE_MODULE_PATH "${old_CMAKE_MODULE_PATH}")
# note: target_deps example: "Qt5Core\;5.12.0;Qt5Gui\;5.12.0"
# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
set(_target_deps "@target_deps@")
foreach(_target_dep ${_target_deps})
list(GET _target_dep 0 pkg)

2
cmake/QtSetup.cmake
View File

@ -17,7 +17,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
endif()
# Appends a 'debug postfix' to library targets (not executables)
# e.g. lib/libQt5DBus_debug.5.12.0.dylib
# e.g. lib/libQt6DBus_debug.5.12.0.dylib
if(WIN32)
set(CMAKE_DEBUG_POSTFIX "d")
elseif(APPLE)

2
cmake/README.md
View File

@ -60,7 +60,7 @@ CMake has a ninja backend that works quite well and is noticeably faster than ma
cmake --build . # ... or ninja ;-)
```
You can look into the generated ``build.ninja`` file if you're curious and you can also build targets directory such as ``ninja lib/libQt5Core.so``.
You can look into the generated ``build.ninja`` file if you're curious and you can also build targets directory such as ``ninja lib/libQt6Core.so``.
When you're done with the build, you may want to install it, using ``ninja install`` or ``make install``. The installation prefix is chosen when running cmake though:

4
examples/corelib/ipc/localfortuneclient/CMakeLists.txt
View File

@ -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(localfortuneclient
client.cpp client.h

4
examples/corelib/ipc/localfortuneserver/CMakeLists.txt
View File

@ -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(localfortuneserver
main.cpp

2
examples/corelib/ipc/sharedmemory/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(sharedmemory
dialog.cpp dialog.h dialog.ui

2
examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(mimetypebrowser
main.cpp

2
examples/corelib/serialization/cbordump/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Core)
find_package(Qt6 COMPONENTS Core)
add_executable(cbordump
main.cpp

2
examples/corelib/serialization/convert/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Core)
find_package(Qt6 COMPONENTS Core)
add_executable(convert
cborconverter.cpp cborconverter.h

2
examples/corelib/serialization/savegame/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Core)
find_package(Qt6 COMPONENTS Core)
add_executable(savegame
character.cpp character.h

2
examples/corelib/threads/mandelbrot/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(mandelbrot
main.cpp

2
examples/corelib/threads/queuedcustomtype/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(queuedcustomtype
block.cpp block.h

2
examples/corelib/threads/semaphores/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Core)
find_package(Qt6 COMPONENTS Core)
add_executable(semaphores
semaphores.cpp

2
examples/corelib/threads/waitconditions/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Core)
find_package(Qt6 COMPONENTS Core)
add_executable(waitconditions
waitconditions.cpp

2
examples/corelib/tools/contiguouscache/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(contiguouscache
main.cpp

2
examples/corelib/tools/customtype/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(customtype
main.cpp

2
examples/corelib/tools/customtypesending/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(customtypesending
main.cpp

4
examples/dbus/chat/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS DBus)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS DBus)
find_package(Qt6 COMPONENTS Widgets)
# special case begin
set(chat_SRCS)

2
examples/dbus/complexpingpong/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS DBus)
find_package(Qt6 COMPONENTS DBus)
add_qt_gui_executable(complexpong
complexpong.cpp complexpong.h

2
examples/dbus/listnames/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS DBus)
find_package(Qt6 COMPONENTS DBus)
add_qt_gui_executable(listnames
listnames.cpp

2
examples/dbus/pingpong/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS DBus)
find_package(Qt6 COMPONENTS DBus)
add_qt_gui_executable(pong
ping-common.h

4
examples/dbus/remotecontrolledcar/car/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS DBus)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS DBus)
find_package(Qt6 COMPONENTS Widgets)
# special case begin
set(car_SRCS)

4
examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS DBus)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS DBus)
find_package(Qt6 COMPONENTS Widgets)
# special case begin
set(controller_SRCS)

2
examples/embedded/digiflip/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(digiflip
digiflip.cpp

2
examples/embedded/flickable/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(flickable
flickable.cpp flickable.h

4
examples/embedded/flightinfo/CMakeLists.txt
View File

@ -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(flightinfo
flightinfo.cpp

4
examples/embedded/lightmaps/CMakeLists.txt
View File

@ -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(lightmaps
lightmaps.cpp lightmaps.h

2
examples/embedded/raycasting/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(raycasting
raycasting.cpp raycasting.qrc

2
examples/embedded/styleexample/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(styleexample
main.cpp

2
examples/gui/analogclock/CMakeLists.txt
View File

@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.14)
project(analogclock LANGUAGES CXX)
find_package(Qt5 COMPONENTS Widgets) # special case: add
find_package(Qt6 COMPONENTS Widgets) # special case: add
set(CMAKE_INCLUDE_CURRENT_DIR ON)

2
examples/gui/openglwindow/CMakeLists.txt
View File

@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.14)
project(openglwindow LANGUAGES CXX)
find_package(Qt5 COMPONENTS Widgets) # special case: add
find_package(Qt6 COMPONENTS Widgets) # special case: add
set(CMAKE_INCLUDE_CURRENT_DIR ON)

2
examples/gui/rasterwindow/CMakeLists.txt
View File

@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.14)
project(rasterwindow LANGUAGES CXX)
find_package(Qt5 COMPONENTS Widgets) # special case: add
find_package(Qt6 COMPONENTS Widgets) # special case: add
set(CMAKE_INCLUDE_CURRENT_DIR ON)

8
examples/network/bearermonitor/CMakeLists.txt
View File

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

4
examples/network/blockingfortuneclient/CMakeLists.txt
View File

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

4
examples/network/broadcastreceiver/CMakeLists.txt
View File

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

4
examples/network/broadcastsender/CMakeLists.txt
View File

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

4
examples/network/dnslookup/CMakeLists.txt
View File

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

4
examples/network/download/CMakeLists.txt
View File

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

4
examples/network/downloadmanager/CMakeLists.txt
View File

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

4
examples/network/fortuneclient/CMakeLists.txt
View File

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

4
examples/network/fortuneserver/CMakeLists.txt
View File

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

4
examples/network/googlesuggest/CMakeLists.txt
View File

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

4
examples/network/http/CMakeLists.txt
View File

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

4
examples/network/loopback/CMakeLists.txt
View File

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

4
examples/network/multicastreceiver/CMakeLists.txt
View File

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

4
examples/network/multicastsender/CMakeLists.txt
View File

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

4
examples/network/multistreamclient/CMakeLists.txt
View File

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

4
examples/network/multistreamserver/CMakeLists.txt
View File

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

4
examples/network/network-chat/CMakeLists.txt
View File

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

4
examples/network/securesocketclient/CMakeLists.txt
View File

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

4
examples/network/secureudpclient/CMakeLists.txt
View File

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

4
examples/network/secureudpserver/CMakeLists.txt
View File

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

4
examples/network/threadedfortuneserver/CMakeLists.txt
View File

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

4
examples/network/torrent/.prev_CMakeLists.txt
View File

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

4
examples/network/torrent/CMakeLists.txt
View File

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

2
examples/qpa/qrasterwindow/CMakeLists.txt
View File

@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.14)
project(qrasterwindow LANGUAGES CXX)
find_package(Qt5 COMPONENTS Gui) # special case
find_package(Qt6 COMPONENTS Gui) # special case
set(CMAKE_INCLUDE_CURRENT_DIR ON)

4
examples/qpa/windows/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Gui)
find_package(Qt5 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Core)
add_executable(windows
main.cpp

4
examples/qtconcurrent/imagescaling/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Concurrent)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Concurrent)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(imagescaling
imagescaling.cpp imagescaling.h

2
examples/qtconcurrent/map/.prev_CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Concurrent)
find_package(Qt6 COMPONENTS Concurrent)
add_executable(mapdemo
main.cpp

4
examples/qtconcurrent/map/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Concurrent)
find_package(Qt5 COMPONENTS Gui) # special case
find_package(Qt6 COMPONENTS Concurrent)
find_package(Qt6 COMPONENTS Gui) # special case
add_executable(mapdemo
main.cpp

4
examples/qtconcurrent/progressdialog/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Concurrent)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Concurrent)
find_package(Qt6 COMPONENTS Widgets)
add_executable(progressdialog
main.cpp

4
examples/qtconcurrent/runfunction/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Concurrent)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Concurrent)
find_package(Qt6 COMPONENTS Widgets)
add_executable(runfunction
main.cpp

4
examples/qtconcurrent/wordcount/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Concurrent)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Concurrent)
find_package(Qt6 COMPONENTS Widgets)
add_executable(wordcount
main.cpp

4
examples/qtestlib/tutorial1/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt5 COMPONENTS Test)
find_package(Qt6 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Test)
add_qt_gui_executable(tutorial1
testqstring.cpp

4
examples/qtestlib/tutorial2/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt5 COMPONENTS Test)
find_package(Qt6 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Test)
add_qt_gui_executable(tutorial2
testqstring.cpp

4
examples/qtestlib/tutorial3/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt5 COMPONENTS Test)
find_package(Qt6 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Test)
add_qt_gui_executable(tutorial3
testgui.cpp

4
examples/qtestlib/tutorial4/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt5 COMPONENTS Test)
find_package(Qt6 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Test)
add_qt_gui_executable(tutorial4
testgui.cpp

4
examples/qtestlib/tutorial5/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt5 COMPONENTS Test)
find_package(Qt6 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Test)
add_qt_gui_executable(tutorial5
benchmarking.cpp

4
examples/sql/books/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Sql)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Sql)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(books
bookdelegate.cpp bookdelegate.h

4
examples/sql/cachedtable/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Sql)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Sql)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(cachedtable
../connection.h

4
examples/sql/drilldown/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Sql)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Sql)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(drilldown
../connection.h

6
examples/sql/masterdetail/CMakeLists.txt
View File

@ -11,9 +11,9 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Sql)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt5 COMPONENTS Xml)
find_package(Qt6 COMPONENTS Sql)
find_package(Qt6 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Xml)
add_qt_gui_executable(masterdetail
database.h

4
examples/sql/querymodel/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Sql)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Sql)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(querymodel
../connection.h

4
examples/sql/relationaltablemodel/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Sql)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Sql)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(relationaltablemodel
../connection.h

4
examples/sql/sqlbrowser/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Sql)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Sql)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(sqlbrowser
browser.cpp browser.h

4
examples/sql/sqlwidgetmapper/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Sql)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Sql)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(sqlwidgetmapper
main.cpp

4
examples/sql/tablemodel/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Sql)
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Sql)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(tablemodel
../connection.h

2
examples/widgets/animation/animatedtiles/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(animatedtiles
animatedtiles.qrc

2
examples/widgets/animation/easing/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(easing
animation.h

2
examples/widgets/animation/moveblocks/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(moveblocks
main.cpp

2
examples/widgets/animation/states/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(states
main.cpp

2
examples/widgets/animation/stickman/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(stickman
animation.cpp animation.h

4
examples/widgets/animation/sub-attaq/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt5 COMPONENTS OpenGL) # special case
find_package(Qt6 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS OpenGL) # special case
add_qt_gui_executable(sub-attaq
animationmanager.cpp animationmanager.h

2
examples/widgets/desktop/screenshot/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(screenshot
main.cpp

2
examples/widgets/desktop/systray/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(systray
main.cpp

2
examples/widgets/dialogs/classwizard/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(classwizard
classwizard.cpp classwizard.h classwizard.qrc

2
examples/widgets/dialogs/extension/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(extension
finddialog.cpp finddialog.h

2
examples/widgets/dialogs/findfiles/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(findfiles
main.cpp

4
examples/widgets/dialogs/licensewizard/CMakeLists.txt
View File

@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt5 COMPONENTS PrintSupport)
find_package(Qt6 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS PrintSupport)
add_qt_gui_executable(licensewizard
licensewizard.cpp licensewizard.h licensewizard.qrc

2
examples/widgets/dialogs/standarddialogs/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(standarddialogs
dialog.cpp dialog.h

2
examples/widgets/dialogs/tabdialog/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(tabdialog
main.cpp

2
examples/widgets/dialogs/trivialwizard/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(trivialwizard
trivialwizard.cpp

Some files were not shown because too many files have changed in this diff Show More