diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-12-14 13:09:38 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-12-16 20:34:53 +0200 |
commit | 248392d985afa273d46f11a74491786139f93077 (patch) | |
tree | 21898208dd3d5cceb62d487be376b4ac73250d62 | |
parent | aaa3b77573f448c14a9526e85813b2e8c8ca6956 (diff) |
qt6: update submodules
Update to latest content in Qt 6.0 branch (snaphot for 6.0.1)
Task-number: QTBUG-89461
Change-Id: I5380dc0c1c1bb6f97118fefe4b4c56bda4f56f63
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r-- | recipes-qt/qt6/qt3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qt5compat_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qt6-git.inc | 4 | ||||
-rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtcoap_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtimageformats_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtmqtt_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtnetworkauth_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtopcua_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtquick3d/0001-CMake-allow-tools-build-without-opengl.patch | 30 | ||||
-rw-r--r-- | recipes-qt/qt6/qtquick3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtquicktimeline_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtshadertools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtsvg_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qttools_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt6/qttranslations_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtwayland_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtwebsockets_git.bb | 2 |
21 files changed, 47 insertions, 27 deletions
diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index f3357d7..993876b 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -25,5 +25,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a PACKAGECONFIG[qtgamepad] = ",,qtgamepad" SRCREV_FORMAT = "qt3d_assimp" -SRCREV_qt3d = "2ed189225580f49695560b59f4fe341da4444253" +SRCREV_qt3d = "858145c3063c4d85c5a81e72d8b5559af3c3b93c" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb index 3826040..c87bfdc 100644 --- a/recipes-qt/qt6/qt5compat_git.bb +++ b/recipes-qt/qt6/qt5compat_git.bb @@ -17,4 +17,4 @@ DEPENDS += "qtbase" PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv" -SRCREV = "46fd0963a547b7907f732324fd822abca3fec8d7" +SRCREV = "3ab7e0df5059337e94ff2ab32960fe85efffc0a9" diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 9836f89..35e5da9 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -2,7 +2,7 @@ DESCRIPTION ?= "Qt is a cross-platform application development framework for des HOMEPAGE ?= "https://www.qt.io" QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "6.0.0" +QT_MODULE_BRANCH ?= "6.0" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}" @@ -11,4 +11,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "6.0.0" +PV = "6.0.1" diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 8dd9601..e7240d2 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -147,4 +147,4 @@ FILES_${PN}-tools += "\ BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "fc9cda5f08ac848e88f63dd4a07c08b2fbc6bf17" +SRCREV = "0908175a1aafe9131c501c3a653ba7621e701f80" diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb index 5dc5e57..f1372fe 100644 --- a/recipes-qt/qt6/qtcoap_git.bb +++ b/recipes-qt/qt6/qtcoap_git.bb @@ -12,4 +12,4 @@ DEPENDS += "qtbase" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative" -SRCREV = "e3492d34c37af5e131c104d358cc9c1aade5c35c" +SRCREV = "76da811b4957da488126ab978959ce804f6f9266" diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb index 7bf0121..0db8c69 100644 --- a/recipes-qt/qt6/qtdeclarative_git.bb +++ b/recipes-qt/qt6/qtdeclarative_git.bb @@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "fa87052d56526e1529e694fb1c69c69eec38f2fd" +SRCREV = "90860849c3b39f7fe34a7c79f00d318fa4561f39" diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb index 3b2c811..d569c77 100644 --- a/recipes-qt/qt6/qtimageformats_git.bb +++ b/recipes-qt/qt6/qtimageformats_git.bb @@ -24,4 +24,4 @@ PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng" PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff" PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp" -SRCREV = "0754fc911d2b441b19bf796ffcb8355619e34512" +SRCREV = "004d3a41048384a63068717a7739f2ee740c522a" diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb index 2661d55..c4bf9fb 100644 --- a/recipes-qt/qt6/qtmqtt_git.bb +++ b/recipes-qt/qt6/qtmqtt_git.bb @@ -13,4 +13,4 @@ DEPENDS += "qtbase" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets" -SRCREV = "abc5e6875f3a31d82eee12d9c86140497b2e9b6b" +SRCREV = "a486fc153fa74c3af6874ccffb417d97585d4a91" diff --git a/recipes-qt/qt6/qtnetworkauth_git.bb b/recipes-qt/qt6/qtnetworkauth_git.bb index 0231235..2d4bac5 100644 --- a/recipes-qt/qt6/qtnetworkauth_git.bb +++ b/recipes-qt/qt6/qtnetworkauth_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "b0523c2519d97a352ef2cd78d82155d85453a5fd" +SRCREV = "5dbe8f5c1f365b0193c62ac3346993baec03f6fc" diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index 6eb66cf..7f6dd1b 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -21,4 +21,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "7fd49429153f56b9f5c885299ab1ba42f2f34c5e" +SRCREV = "fc7b40cfae5486dd2625880401ba0766f336e809" diff --git a/recipes-qt/qt6/qtquick3d/0001-CMake-allow-tools-build-without-opengl.patch b/recipes-qt/qt6/qtquick3d/0001-CMake-allow-tools-build-without-opengl.patch index 5e8f0e1..0f84a4b 100644 --- a/recipes-qt/qt6/qtquick3d/0001-CMake-allow-tools-build-without-opengl.patch +++ b/recipes-qt/qt6/qtquick3d/0001-CMake-allow-tools-build-without-opengl.patch @@ -1,19 +1,37 @@ -From 2a86d7934907f8abc9f9d90885673532ba7a2d79 Mon Sep 17 00:00:00 2001 +From 9b55827e3adfed1129958819b93c86ede44b4949 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 28 Aug 2020 14:49:11 +0300 Subject: [PATCH] CMake: allow tools build without opengl Change-Id: I76d750b5bd29103133578152241c11bc35b14552 --- + CMakeLists.txt | 6 ------ tools/balsam/CMakeLists.txt | 1 - tools/meshdebug/CMakeLists.txt | 1 - - 2 files changed, 2 deletions(-) + 3 files changed, 8 deletions(-) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f4574c6d..14fbe043 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,12 +33,6 @@ if(NOT TARGET Qt::Quick) + return() + endif() + +-# special case begin +-if(NOT TARGET Qt::OpenGL) +- message(NOTICE "Skipping the build as the condition \"TARGET Qt::OpenGL\" is not met.") +- return() +-endif() +- + find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS ShaderTools) + # special case end + diff --git a/tools/balsam/CMakeLists.txt b/tools/balsam/CMakeLists.txt -index 55a090de..7b09f0b4 100644 +index 99002525..b308311d 100644 --- a/tools/balsam/CMakeLists.txt +++ b/tools/balsam/CMakeLists.txt -@@ -10,7 +10,6 @@ qt_add_tool(balsam +@@ -11,7 +11,6 @@ qt_internal_add_tool(${target_name} main.cpp PUBLIC_LIBRARIES Qt::Qml # special case @@ -22,10 +40,10 @@ index 55a090de..7b09f0b4 100644 Qt::Quick3DAssetImportPrivate ) diff --git a/tools/meshdebug/CMakeLists.txt b/tools/meshdebug/CMakeLists.txt -index 18872bd7..e712b4d2 100644 +index 812155ef..b497e9a4 100644 --- a/tools/meshdebug/CMakeLists.txt +++ b/tools/meshdebug/CMakeLists.txt -@@ -10,7 +10,6 @@ qt_add_tool(meshdebug +@@ -11,7 +11,6 @@ qt_internal_add_tool(${target_name} main.cpp PUBLIC_LIBRARIES Qt::Qml # special case diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index 4b0e00f..668a9f9 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \ " SRCREV_FORMAT = "qtquick3d_assimp" -SRCREV_qtquick3d = "af258ce11bc73540f1205dd13d7ed418c2c025bb" +SRCREV_qtquick3d = "a2c9ce10849c0cc5940a90be861e1a11203806a4" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" diff --git a/recipes-qt/qt6/qtquickcontrols2_git.bb b/recipes-qt/qt6/qtquickcontrols2_git.bb index 714138b..fffd61a 100644 --- a/recipes-qt/qt6/qtquickcontrols2_git.bb +++ b/recipes-qt/qt6/qtquickcontrols2_git.bb @@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtdeclarative" -SRCREV = "9a19ec26f45e7382431f52136f03887cfaa04b66" +SRCREV = "2921271ff5ade3f1c02688aa1b71cf6c7d1023ba" diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index 0acd897..f74504d 100644 --- a/recipes-qt/qt6/qtquicktimeline_git.bb +++ b/recipes-qt/qt6/qtquicktimeline_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtdeclarative" -SRCREV = "3ca11a6edc751e7c413cd9e149dfc4dfe56b8981" +SRCREV = "dede2b131acce3b485da1c0033e2b4381fc1c904" diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb index a184f06..162e2bf 100644 --- a/recipes-qt/qt6/qtshadertools_git.bb +++ b/recipes-qt/qt6/qtshadertools_git.bb @@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "d3728dae58eca05bdac1f934ef981dd2bb6fa66a" +SRCREV = "519646b46bf803260cf6b0fd372ec122c4232609" diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb index 92eaa94..8ec73a1 100644 --- a/recipes-qt/qt6/qtsvg_git.bb +++ b/recipes-qt/qt6/qtsvg_git.bb @@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "608054063bf58c555a1871e0a4df9c329c3b6885" +SRCREV = "b30dc44f0e3b1a80a03d15009463514cbb619311" diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index 42880be..53cef8b 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -14,6 +14,8 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative qttools-native" +FILES_${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks" + BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "3fd594493c3ba31639a7515b901554456a90b4c7" +SRCREV = "25f1b733a9939d1d7b2074785ad85c1e505f9810" diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb index bb0bf33..c82d423 100644 --- a/recipes-qt/qt6/qttranslations_git.bb +++ b/recipes-qt/qt6/qttranslations_git.bb @@ -18,4 +18,4 @@ python populate_packages_prepend () { 'Qt translations for %s', extra_depends='') } -SRCREV = "00c3b3f8934a52a3a9999d8df8919b00baad116c" +SRCREV = "1e3d52281292dbde6aaddfb749bb094e1b231287" diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb index 1481569..07ba548 100644 --- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb @@ -120,4 +120,4 @@ FILES_${PN} += "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native" -SRCREV = "84a790bad0ad171948cba02ef2f60559598ba36a" +SRCREV = "516aeec45e2a43edde8b80369ca62156e27b7f5b" diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb index 797bcab..700766e 100644 --- a/recipes-qt/qt6/qtwayland_git.bb +++ b/recipes-qt/qt6/qtwayland_git.bb @@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "bd91a3fce0284c0ca410358b4a1bdb58b58e4ecb" +SRCREV = "d85237a9ba0b53bcf5f251d5558d1019642ffc3f" diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb index 454ef82..88035ea 100644 --- a/recipes-qt/qt6/qtwebsockets_git.bb +++ b/recipes-qt/qt6/qtwebsockets_git.bb @@ -15,4 +15,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "e861ee912cb633643fc49d26db960b652e6f3357" +SRCREV = "6a6a7203f4e1856044181fb5db51f2f08388d127" |