diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2021-04-17 11:15:05 +0000 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2021-04-17 11:15:05 +0000 |
| commit | b4ed762397decf237a34ac7d2da0fd120658f290 (patch) | |
| tree | 6d6b88ee79ae62674378d8b1d404b2636b873a2c | |
| parent | c00a3c1ec6447d1314420edc13cf67cdc147701e (diff) | |
| parent | c99c2e8510182e84525b7255a2f39aa8e0734d91 (diff) | |
Merge branch 6.0 into pyside6.0
Change-Id: Idaaa6254cad34632941f175e8dfb5620020a3828
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| m--------- | qt5compat | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtqa | 0 | ||||
| m--------- | qtquick3d | 0 | ||||
| m--------- | qtquickcontrols2 | 0 | ||||
| m--------- | qtquicktimeline | 0 | ||||
| m--------- | qtshadertools | 0 | ||||
| m--------- | qtsvg | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qttranslations | 0 | ||||
| m--------- | qtwayland | 0 |
14 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 45018c58..5fe9a6ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/qt5compat b/qt5compat -Subproject 3dedca3f0895b08fb8356adf0075d6e5f241246 +Subproject 99777e6b1d346a0b5b87ff47448e01d7e589ceb diff --git a/qtbase b/qtbase -Subproject fa2efb8b3577c69fee305c0d74f6996bbf84bd7 +Subproject 315975335816314c849c7d6fa914800d16ff719 diff --git a/qtdeclarative b/qtdeclarative -Subproject 830ee55e6568e668b1a887e218168a282417431 +Subproject 6160f471fc12fe7ce701f8bd9aad2111ddc9176 diff --git a/qtdoc b/qtdoc -Subproject 1b4549325cbb217ebfc7295fa216636ff83d3f8 +Subproject 327b407f2758f225db8757499289efa3296ed42 diff --git a/qtqa b/qtqa -Subproject 41fbf9256ba6675ea2d74109493bd1a3c692eaa +Subproject 85be2c2f08e1e759e1f0862c812df7253af8301 diff --git a/qtquick3d b/qtquick3d -Subproject 06421c5c1618bac4c633202127adfce7c7ba0b1 +Subproject dfcb069aad6ea62369da70b2e66ce9ea6cf3fe6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject ab87e4410d113a3c13d1859ce4bd382b687fe16 +Subproject 14dbf1dc596fb311c10b235952e9070f5e6c66f diff --git a/qtquicktimeline b/qtquicktimeline -Subproject f37298efa219fbeb98836652f7f06a52facc240 +Subproject 61078ef4996c74acff9c520b253d22b6c6f0c53 diff --git a/qtshadertools b/qtshadertools -Subproject effd474e86b294a64b366b3a547f6a66b3dfac1 +Subproject cf6d74e993409eb7695909df0c874fab659af6b diff --git a/qtsvg b/qtsvg -Subproject ed31e766662dfed60d0b40f37a1926b33bf7fa2 +Subproject 68e1442ba3e7ac9b31f5e119332bb4b579cef4e diff --git a/qttools b/qttools -Subproject aee7f2ec612c0d6285382e634be5e0b10da66c3 +Subproject 09b559ab8dd88e7fbb172ce16ebac0c991d6373 diff --git a/qttranslations b/qttranslations -Subproject 4503a6539aef626571389a1c205f378950b7218 +Subproject ac5ecf2da8aa2f632814f7beb0ca9fcac10c98f diff --git a/qtwayland b/qtwayland -Subproject 0f6b246a44b2d1e6c0c7bf01fb46584d512a574 +Subproject 8ab42898f75e97c90bc86eed64c3a8995e9eb29 |