Merge branch 6.0 into pyside6.0

Change-Id: Idaaa6254cad34632941f175e8dfb5620020a3828
This commit is contained in:
Qt Forward Merge Bot
2021-04-17 11:15:05 +00:00
14 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION ${__qt_minimum_cmake_version})
include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
project(Qt
VERSION 6.0.1
VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt Libraries"
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C ASM
+1 -1
Submodule qtbase updated: fa2efb8b35...3159753358
+1 -1
Submodule qtdoc updated: 1b4549325c...327b407f27
+1 -1
Submodule qtqa updated: 41fbf9256b...85be2c2f08
+1 -1
Submodule qtsvg updated: ed31e76666...68e1442ba3
+1 -1
Submodule qttools updated: aee7f2ec61...09b559ab8d