From 214f78598f3dfb20f525987e96e747d2442a6219 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 15 Apr 2021 12:45:41 +0200 Subject: CMake: Use qtbase's version as the top-level project version This avoids the need to bump the qt5.git project version when branching the next minor Qt version. Task-number: QTBUG-92861 Change-Id: Ib20ab614caefece00bd9e0172d9269077239ba6a Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann (cherry picked from commit 002b6f075c09cfb5507007a9bfe620195a859f08) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From c15f11cc06c991d9a550e28d31bafd254b6abcbf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 16 Apr 2021 22:17:27 +0300 Subject: Update submodules on '6.0' in qt/qt5 Change-Id: Ib1a4d1dd25985d8d63fd9ea789dcb672149a28c0 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index 3dedca3f..0f51f3fe 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 3dedca3f0895b08fb8356adf0075d6e5f241246b +Subproject commit 0f51f3fec54defc3dcef78387f73171464177913 diff --git a/qtbase b/qtbase index fa2efb8b..8eeae7ae 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fa2efb8b3577c69fee305c0d74f6996bbf84bd7a +Subproject commit 8eeae7ae073ddd71a9210c0d3d1edaa6c199f509 diff --git a/qtdeclarative b/qtdeclarative index 830ee55e..fe83d6af 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 830ee55e6568e668b1a887e218168a282417431a +Subproject commit fe83d6afe557ac4b08e72899942f0422983c67ce diff --git a/qtdoc b/qtdoc index 1b454932..e0168229 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1b4549325cbb217ebfc7295fa216636ff83d3f8f +Subproject commit e0168229c8a7697aa82a2b2698152d19604824c1 diff --git a/qtquick3d b/qtquick3d index 06421c5c..e363cb33 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 06421c5c1618bac4c633202127adfce7c7ba0b1a +Subproject commit e363cb335c76a77125e064f08424abf070a15caa diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ab87e441..7583387f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ab87e4410d113a3c13d1859ce4bd382b687fe161 +Subproject commit 7583387fda51f06ac3ee55ba21790b02824d6a5b diff --git a/qtquicktimeline b/qtquicktimeline index f37298ef..977cefc5 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit f37298efa219fbeb98836652f7f06a52facc2401 +Subproject commit 977cefc543d402cca4547c560281deda18f4e819 diff --git a/qtshadertools b/qtshadertools index effd474e..5b71d980 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit effd474e86b294a64b366b3a547f6a66b3dfac11 +Subproject commit 5b71d9809e383a0b741868924e7517b32c036443 diff --git a/qtsvg b/qtsvg index ed31e766..710d5d27 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ed31e766662dfed60d0b40f37a1926b33bf7fa23 +Subproject commit 710d5d276b724cdc5093a96474c8dd0b827f6aed diff --git a/qttools b/qttools index aee7f2ec..4c4a6eab 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit aee7f2ec612c0d6285382e634be5e0b10da66c3d +Subproject commit 4c4a6eab721354b3ffa7b4c2d4aac2d2381180fd diff --git a/qttranslations b/qttranslations index 4503a653..057014a4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 4503a6539aef626571389a1c205f378950b72181 +Subproject commit 057014a4e42cc61e9337d936f51d9e023d04e7e5 diff --git a/qtwayland b/qtwayland index 0f6b246a..8d532e90 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 0f6b246a44b2d1e6c0c7bf01fb46584d512a574d +Subproject commit 8d532e90fb701f99584116ff71c88e0be37571f3 -- cgit v1.2.3 From 40fbad4c27b87c0e5867dc9cbf2b21b78b0a41d9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Apr 2021 05:28:54 +0300 Subject: Update submodules on '6.0' in qt/qt5 Change-Id: I66ed9db9b37fc3dad03da4bbec96fe456a9e70a8 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index 0f51f3fe..d5336677 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 0f51f3fec54defc3dcef78387f73171464177913 +Subproject commit d53366772321e694b7e22b0e6054b61a35e02498 diff --git a/qtbase b/qtbase index 8eeae7ae..721f582e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8eeae7ae073ddd71a9210c0d3d1edaa6c199f509 +Subproject commit 721f582e5b016cd2118275f2a706bed4e3f459d4 diff --git a/qtdeclarative b/qtdeclarative index fe83d6af..e3a5f941 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fe83d6afe557ac4b08e72899942f0422983c67ce +Subproject commit e3a5f9414a12206dc9d4903e793512765e55d40e diff --git a/qtdoc b/qtdoc index e0168229..3e8ae43e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e0168229c8a7697aa82a2b2698152d19604824c1 +Subproject commit 3e8ae43e1ce03c2e8b2ab80a725c68e93125d811 diff --git a/qtqa b/qtqa index 41fbf925..85be2c2f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 41fbf9256ba6675ea2d74109493bd1a3c692eaa1 +Subproject commit 85be2c2f08e1e759e1f0862c812df7253af83014 diff --git a/qtquick3d b/qtquick3d index e363cb33..5ca256e2 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e363cb335c76a77125e064f08424abf070a15caa +Subproject commit 5ca256e2d0323999031f531457122e4d4eed80be diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7583387f..2e3c0599 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7583387fda51f06ac3ee55ba21790b02824d6a5b +Subproject commit 2e3c059912e9cbdcb4c9f5147b5351c4db429ac3 diff --git a/qtquicktimeline b/qtquicktimeline index 977cefc5..b5e64381 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 977cefc543d402cca4547c560281deda18f4e819 +Subproject commit b5e64381e40c1ff373098ff99c34c2ecdf3f90c1 diff --git a/qtshadertools b/qtshadertools index 5b71d980..7be850a2 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 5b71d9809e383a0b741868924e7517b32c036443 +Subproject commit 7be850a2af2ce468abb5c6009b1b97e767b771cc diff --git a/qtsvg b/qtsvg index 710d5d27..fb4231e3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 710d5d276b724cdc5093a96474c8dd0b827f6aed +Subproject commit fb4231e3246de82ceda407726f2711e2549b4356 diff --git a/qttools b/qttools index 4c4a6eab..16ab8f0e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4c4a6eab721354b3ffa7b4c2d4aac2d2381180fd +Subproject commit 16ab8f0e04d687a5d38545c8186e5ab3478eaaee diff --git a/qttranslations b/qttranslations index 057014a4..75a9c4f3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 057014a4e42cc61e9337d936f51d9e023d04e7e5 +Subproject commit 75a9c4f3c5ceecd20f7cc245fac9bb3a0bee1e8f diff --git a/qtwayland b/qtwayland index 8d532e90..0fa51152 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8d532e90fb701f99584116ff71c88e0be37571f3 +Subproject commit 0fa51152dcb42d4afc096645f1c92d65468a934b -- cgit v1.2.3 From c99c2e8510182e84525b7255a2f39aa8e0734d91 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Apr 2021 09:47:52 +0300 Subject: Update submodules on '6.0' in qt/qt5 Change-Id: I87b67fc41449726385f177cc2eb24bb851d5dadf Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index d5336677..99777e6b 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit d53366772321e694b7e22b0e6054b61a35e02498 +Subproject commit 99777e6b1d346a0b5b87ff47448e01d7e589ceb5 diff --git a/qtbase b/qtbase index 721f582e..31597533 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 721f582e5b016cd2118275f2a706bed4e3f459d4 +Subproject commit 315975335816314c849c7d6fa914800d16ff719b diff --git a/qtdeclarative b/qtdeclarative index e3a5f941..6160f471 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e3a5f9414a12206dc9d4903e793512765e55d40e +Subproject commit 6160f471fc12fe7ce701f8bd9aad2111ddc9176b diff --git a/qtdoc b/qtdoc index 3e8ae43e..327b407f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3e8ae43e1ce03c2e8b2ab80a725c68e93125d811 +Subproject commit 327b407f2758f225db8757499289efa3296ed428 diff --git a/qtquick3d b/qtquick3d index 5ca256e2..dfcb069a 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 5ca256e2d0323999031f531457122e4d4eed80be +Subproject commit dfcb069aad6ea62369da70b2e66ce9ea6cf3fe62 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2e3c0599..14dbf1dc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2e3c059912e9cbdcb4c9f5147b5351c4db429ac3 +Subproject commit 14dbf1dc596fb311c10b235952e9070f5e6c66f1 diff --git a/qtquicktimeline b/qtquicktimeline index b5e64381..61078ef4 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit b5e64381e40c1ff373098ff99c34c2ecdf3f90c1 +Subproject commit 61078ef4996c74acff9c520b253d22b6c6f0c537 diff --git a/qtshadertools b/qtshadertools index 7be850a2..cf6d74e9 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 7be850a2af2ce468abb5c6009b1b97e767b771cc +Subproject commit cf6d74e993409eb7695909df0c874fab659af6bb diff --git a/qtsvg b/qtsvg index fb4231e3..68e1442b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit fb4231e3246de82ceda407726f2711e2549b4356 +Subproject commit 68e1442ba3e7ac9b31f5e119332bb4b579cef4e8 diff --git a/qttools b/qttools index 16ab8f0e..09b559ab 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 16ab8f0e04d687a5d38545c8186e5ab3478eaaee +Subproject commit 09b559ab8dd88e7fbb172ce16ebac0c991d63738 diff --git a/qttranslations b/qttranslations index 75a9c4f3..ac5ecf2d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 75a9c4f3c5ceecd20f7cc245fac9bb3a0bee1e8f +Subproject commit ac5ecf2da8aa2f632814f7beb0ca9fcac10c98f0 diff --git a/qtwayland b/qtwayland index 0fa51152..8ab42898 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 0fa51152dcb42d4afc096645f1c92d65468a934b +Subproject commit 8ab42898f75e97c90bc86eed64c3a8995e9eb297 -- cgit v1.2.3