From cde62a02b20aac573b2cb7cb8dbc90371ea641da Mon Sep 17 00:00:00 2001 From: Jani Suonpera Date: Fri, 8 Jan 2021 10:42:31 +0200 Subject: Submodule update for 5.15.3 LTS branches are used which need ssh access to coderview. LTS branches are commercial only. Task-number: QTBUG-88745 Change-Id: Id1273d8ba27e04aea4a1abf291370855ce57a73c Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 ++-- recipes-qt/qt5/qt3d_git.bb | 4 ++-- recipes-qt/qt5/qt5-git.inc | 7 ++++--- recipes-qt/qt5/qt5-lts.inc | 9 +++++++++ recipes-qt/qt5/qtbase-native_git.bb | 4 ++-- recipes-qt/qt5/qtbase_git.bb | 4 ++-- recipes-qt/qt5/qtcharts_git.bb | 4 ++-- recipes-qt/qt5/qtcoap_git.bb | 4 ++-- recipes-qt/qt5/qtconnectivity_git.bb | 4 ++-- recipes-qt/qt5/qtdatavis3d_git.bb | 4 ++-- recipes-qt/qt5/qtdeclarative_git.bb | 4 ++-- recipes-qt/qt5/qtgamepad_git.bb | 4 ++-- recipes-qt/qt5/qtgraphicaleffects_git.bb | 4 ++-- recipes-qt/qt5/qtimageformats_git.bb | 4 ++-- recipes-qt/qt5/qtknx_git.bb | 4 ++-- recipes-qt/qt5/qtlocation_git.bb | 4 ++-- recipes-qt/qt5/qtlottie_git.bb | 4 ++-- recipes-qt/qt5/qtmqtt_git.bb | 4 ++-- recipes-qt/qt5/qtmultimedia_git.bb | 4 ++-- recipes-qt/qt5/qtnetworkauth_git.bb | 4 ++-- recipes-qt/qt5/qtopcua_git.bb | 4 ++-- recipes-qt/qt5/qtpurchasing_git.bb | 4 ++-- recipes-qt/qt5/qtquick3d_git.bb | 4 ++-- recipes-qt/qt5/qtquickcontrols2_git.bb | 4 ++-- recipes-qt/qt5/qtquickcontrols_git.bb | 4 ++-- recipes-qt/qt5/qtquicktimeline_git.bb | 4 ++-- recipes-qt/qt5/qtremoteobjects_git.bb | 4 ++-- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 4 ++-- recipes-qt/qt5/qtsensors_git.bb | 4 ++-- recipes-qt/qt5/qtserialbus_git.bb | 4 ++-- recipes-qt/qt5/qtserialport_git.bb | 4 ++-- recipes-qt/qt5/qtsvg_git.bb | 4 ++-- recipes-qt/qt5/qttools_git.bb | 4 ++-- recipes-qt/qt5/qttranslations_git.bb | 4 ++-- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 4 ++-- recipes-qt/qt5/qtwayland_git.bb | 4 ++-- recipes-qt/qt5/qtwebchannel_git.bb | 4 ++-- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebglplugin_git.bb | 4 ++-- recipes-qt/qt5/qtwebsockets_git.bb | 4 ++-- recipes-qt/qt5/qtwebview_git.bb | 4 ++-- recipes-qt/qt5/qtx11extras_git.bb | 4 ++-- recipes-qt/qt5/qtxmlpatterns_git.bb | 4 ++-- 44 files changed, 96 insertions(+), 86 deletions(-) create mode 100644 recipes-qt/qt5/qt5-lts.inc diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 4bf81339..af09a20d 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \ QT_MODULE = "qtbase" require nativesdk-qt5.inc -require qt5-git.inc +require qt5-lts.inc # it's already included with newer oe-core, but include it here for dylan FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" @@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28" +SRCREV = "ffa0ecdc5d507754ddd962e2edbc859c198b2700" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 294cffb4..ab8ee711 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "LGPL-3.0 | GPL-2.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "34171b1d99f55fde1627df3c57eed50480ab2ae7" +SRCREV = "3b8ef584594048514645bc818ab5dd43cf882fe1" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index f1d724dd..2e4240a2 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -2,16 +2,17 @@ # Copyright (C) 2013-2020 Martin Jansa QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.15.2" +QT_MODULE_BRANCH ?= "5.15" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" +QT_MODULE_REPO ?= "${QT_MODULE}.git" # each module needs to define valid SRCREV SRC_URI = " \ - ${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL} \ + ${QT_GIT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL} \ " CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.15.2+git${SRCPV}" +PV = "5.15.3+git${SRCPV}" diff --git a/recipes-qt/qt5/qt5-lts.inc b/recipes-qt/qt5/qt5-lts.inc new file mode 100644 index 00000000..98ac3ce0 --- /dev/null +++ b/recipes-qt/qt5/qt5-lts.inc @@ -0,0 +1,9 @@ +require qt5-git.inc + +QT_GIT = "git://codereview.qt-project.org:29418/${QT_GIT_PROJECT}" +QT_GIT_PROTOCOL = "ssh" +QT_MODULE_BRANCH = "tqtc/lts-5.15" +QT_MODULE_REPO = "tqtc-${QT_MODULE}.git" + +# Default to commercially licensed Qt LTS +QT_EDITION = "commercial" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 4be4aaa8..cabe8acc 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ " require qt5-native.inc -require qt5-git.inc +require qt5-lts.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared @@ -142,4 +142,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28" +SRCREV = "ffa0ecdc5d507754ddd962e2edbc859c198b2700" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index a7811ddf..e8a7ad65 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc require qt5-ptest.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" @@ -302,4 +302,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28" +SRCREV = "ffa0ecdc5d507754ddd962e2edbc859c198b2700" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 1a5238f1..00d69d03 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "a67f812548b008e3eedcd2bb9313828a195fd23b" +SRCREV = "130463160b4923069eb98da49edaf7d93180f4f8" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index 83ee40b7..bc74eea1 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" DEPENDS += "qtbase" -SRCREV = "628d3b8abd47ffde45252cf6591ed10ec2fa28ac" +SRCREV = "939716873ed57613db879856cf71bde95de6e7bf" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 948f59a5..04826b90 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "ca6cc606d9fc0947ea6c27738a1ca8f12f3258ea" +SRCREV = "69a87a9b831e36a578594a0a13130c384ad03121" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 70e14f06..0c80d9ea 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "1168c788a117e4556e6cd0ba1e267a86ef62b0c4" +SRCREV = "c085311c02dd216e5a041b90c164d55b3cf3ce92" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 3ff69d60..c94965fa 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc require qt5-ptest.inc HOMEPAGE = "http://www.qt.io" @@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "104eae5b17b0ec700391e9539ee3a4f638588194" +SRCREV = "e203a185cfab199a89a33b903096d6d0023a8a88" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 076f25a6..3746a392 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GPL-3.0 | LGPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "ff933a4e72826a77c81c4153f1adcf765ead35f0" +SRCREV = "64afa18a0a1e9588060e2e6d917bb01ccdd48a81" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 9657a5ef..0b4ef2bb 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ @@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "66b7fbaca4b323dce337e87e3093c8836577c561" +SRCREV = "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 43db80ff..dec19f98 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "74a5bc4a45195b876454e596e76cb23aeb365410" +SRCREV = "cb82c74310837fe4e832c8ab72176a5d63e4355f" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 9891eefb..0d24c3e4 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "0d2ce613010c0cc9c69f6821c06a34b6721482b4" +SRCREV = "dae081dc404f62619a9945c76898519cb7b524d6" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 89d42813..4ee9ce5b 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "Apache-2.0 & MIT & openssl & BSL-1.0 & GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ @@ -35,7 +35,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "02a21217a9706402802f38c646797be8eccb86e4" +SRCREV_qtlocation = "861e372b6ad81570d4f496e42fb25a6699b72f2f" SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index b4a93300..a886ce41 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "b182dcd78a35b4667b2568857b7719d555c7fddb" +SRCREV = "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index b3db343e..6d1cc295 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "cade213f562049400da81e60762400df68d7c56b" +SRCREV = "0b4955ce8b692409c3deded57892eb61e75be428" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index fdbebd6d..77c03eef 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ @@ -38,7 +38,7 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "fd30913d4601d12437404e1d20113a1ed6364ccc" +SRCREV = "bd29c87027637a013f2c5e3b549fcda84e4d7545" # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory do_install_append() { diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 79d00544..f3312128 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = " \ " require qt5.inc -require qt5-git.inc +require qt5-lts.inc DEPENDS += "qtbase" -SRCREV = "fb2d6d47a0c961278d63309789a1141c3734818b" +SRCREV = "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 7b3ae682..cabfca75 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "( GFDL-1.3 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial ) & MPL-2.0 & CC0-1.0" LIC_FILES_CHKSUM = " \ @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "6d45793cae6f9e744c7bba82f905e431978ce3d0" +SRCREV = "c400d4ecf9778e7359da5b1ce9b3e61cc0f49f2e" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 554bb8f7..95a810a9 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc HOMEPAGE = "http://www.qt.io" LICENSE = "Apache-2.0 & BSD & ( LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial )" @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "ddfa4d16243128d2871a51c513e025d518151b17" +SRCREV = "cbf444fb570ca4f4ca21d963d2ae4010f10d473e" diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index a56e26db..61461056 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "(GPL-3.0 & BSD) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_qtquick3d = "2e05e6d6546635a8f25882c5140fb17697be0062" +SRCREV_qtquick3d = "68b30bb23e34426e7d6a4c243a42ae57dfe45c6b" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qtquick3d_assimp" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index fed17dad..3eb68116 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "16f27dfa3588c2bf377568ce00bf534af48c9558" +SRCREV = "a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index c2960096..2cd9ce19 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "7c29283041a50def3ceca7de4471f211c9b30d4e" +SRCREV = "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420" diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb index 61920c04..2ea80856 100644 --- a/recipes-qt/qt5/qtquicktimeline_git.bb +++ b/recipes-qt/qt5/qtquicktimeline_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc DESCRIPTION = "Qt Quick Timeline" LICENSE = "GPL-2.0+ | The-Qt-Company-Commercial" @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtbase qtdeclarative" -SRCREV = "147ad75c589fc4804429710fdb177cc48a80dbea" +SRCREV = "67503cdadea43b95ddad0de1a04951aff0ce1a07" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index c9519137..bdf067db 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ " require qt5.inc -require qt5-git.inc +require qt5-lts.inc DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" @@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "8e889442508e284691c923470eb4552c96afdfe3" +SRCREV = "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 773bc044..4c004624 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "5da7de1800eee3d604eb7e787b114479b61ffc93" +SRCREV = "5be95f966aabc5170f0aacfd4b0a46217241bfd6" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 7a0975bf..0959af9e 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = " \ " require qt5.inc -require qt5-git.inc +require qt5-lts.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "95aa78be795a862b95371afa75e1417029ec0a16" +SRCREV = "7a15000f42c7a3171719727cd056f82a78244ed7" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15 # 5.15.meta-qt5.1 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index c4b90f84..85f45949 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "5618198e6df5e0224f79f786a44af7527b431545" +SRCREV = "921a31375f29e429e95352b08b2b9dbfea663cb1" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 2b0c2669..13bdc0fb 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -17,4 +17,4 @@ PACKAGECONFIG[socketcan] = "-feature-socketcan,-no-feature-socketcan,,libsocketc EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1aa9b03756baead139943712839af5ecedeb2989" +SRCREV = "8884c5e43df846deac5a0c7c290eeb633d6bfe32" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index b59d921d..4995900d 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "192e376b01e65e7277772bdc94106613c22cf531" +SRCREV = "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 52d82653..cec31869 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc HOMEPAGE = "http://www.qt.io" LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "52d3788c7b0116ea3db232dccca5f1e3f1e229ac" +SRCREV = "aceea78cc05ac8ff947cee9de8149b48771781a8" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 63566035..6b17e78d 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc HOMEPAGE = "http://www.qt.io" LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" @@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ " -SRCREV = "cc52debd905e0ed061290d6fd00a5f1ab67478a5" +SRCREV = "33693a928986006d79c1ee743733cde5966ac402" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index ecc9db2f..35efea20 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "cb1857418b36780b0444333f3aa6250ca3780f19" +SRCREV = "68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index c3b8a90f..8036bfe8 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "7b90415c58dd02c682a9ba317f273d7b3398ff88" +SRCREV = "2f0e9f98c6c6fdac09f762d41fddcc114f64b28a" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index f3fea401..f0007ee6 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native" DEPENDS_append_class-target = " libxkbcommon" @@ -43,7 +43,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "3cc17177b1b03053276eb6236fda137c588261a7" +SRCREV = "a8d35b3c18bdb05a0da3ed50a554a7b7bd4ebed3" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 052bfd80..078294e4 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "90cffd49575b075b0dc28440c693753d860fee87" +SRCREV = "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index b00ba48c..27fa629f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -197,8 +197,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc" -SRCREV_chromium = "fb6ab5e483876298235be1c6a6013b426c82b759" +SRCREV_qtwebengine = "f328054d2eafc073b98a0246b2d644ee09c99d9c" +SRCREV_chromium = "25db271c9b53e576cbb2cdc84d2c56ca5e8633a8" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index fd14851a..058b2d45 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "5e41e564aaf96b7e49403af5099995efbe4cac8e" +SRCREV = "550a8cee241bbf8c11863dec9587d579dcb1108b" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index c84f7828..1e48483f 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "f73735911b2124ef16aa39228bf8f89ee900ba5d" +SRCREV = "e7883bc64440b1ff4666272ac6eb710ee4bc221b" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index fcabec7a..c1300c6e 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ " require qt5.inc -require qt5-git.inc +require qt5-lts.inc DEPENDS += "qtbase qtwebengine" @@ -23,4 +23,4 @@ python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') } -SRCREV = "800926cc4e0ecfdb37a3b34486403354b66a37a4" +SRCREV = "920de5f1cd9f9001cfef1bfd2c19e6720793362f" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 8a24f2f7..2d692b5a 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "9bb0adeac84da6723cf57a2bb0d0c3b405691a15" +SRCREV = "3898f5484fd4864b047729bfeda9a1222f32364f" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index f5db658d..a458e0b5 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -1,5 +1,5 @@ require qt5.inc -require qt5-git.inc +require qt5-lts.inc require qt5-ptest.inc HOMEPAGE = "http://www.qt.io" @@ -25,6 +25,6 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "50421402f05b3ee3c76c6cff455a69efaf576b6d" +SRCREV = "189e28d0aff1f3d7960228ba318b83e3cadac98c" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3