diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-02-06 12:23:04 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-04-29 15:18:14 +0200 |
commit | e52ce4223b17316da59bf7e9c7979ab0ea1cf7cd (patch) | |
tree | c35924d9bcf5458ac40402cadb00d3f29c60c152 /recipes-qt | |
parent | c1f201aab5677a58cc6a07daa5cc59ff9aec7355 (diff) |
qt5: upgrade to 5.14.2
* Upgrade to Qt 5.14.2
* Update license to v4.2.1
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt')
45 files changed, 44 insertions, 121 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 5daf34aa..42defb01 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -41,7 +41,6 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0017-qfloat16-check-for-__ARM_FP-2.patch \ file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ " @@ -195,4 +194,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 = "0ab53fbdda2fd7f24f45dcd52fbd195e282554da" +SRCREV = "3a6d8df5219653b043bd642668cee193f563ec84" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index cd42855c..bae2ecec 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "5aedae5aa9251e1216d7bc1652cb1f451dd047c1" +SRCREV = "ea698681d9669089cd7438d2690363cb5c690fd2" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 54e4aeb4..f477afd6 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.14.1+git${SRCPV}" +PV = "5.14.2+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 2e265984..1bcbd1cb 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -36,7 +36,6 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0017-qfloat16-check-for-__ARM_FP-2.patch \ file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ " @@ -143,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 = "0ab53fbdda2fd7f24f45dcd52fbd195e282554da" +SRCREV = "3a6d8df5219653b043bd642668cee193f563ec84" diff --git a/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch deleted file mode 100644 index 27fc8a83..00000000 --- a/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e9b0666990eb91c18f42f4f15e863273462f544a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 5 Oct 2019 16:21:08 -0700 -Subject: [PATCH] qfloat16: check for __ARM_FP & 2 - -Clang hides vcvt_f16_f32() and vcvt_f32_f16() behind (__ARM_FP & 2) where 2 refers to -mfpu=fp-armv8. -However, GCC would only build this code if -march=armv8.2-a+fp16 is passed as well. - -global/qfloat16.cpp:149:31: error: use of undeclared identifier 'vcvt_f16_f32' - vst1_f16(out_f16 + i, vcvt_f16_f32(vld1q_f32(in + i))); - ^ -global/qfloat16.cpp:159:28: error: use of undeclared identifier 'vcvt_f32_f16' - vst1q_f32(out + i, vcvt_f32_f16(vld1_f16(in_f16 + i))); - ^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/corelib/global/qfloat16.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp -index c868e879b7..0c9bb80cb2 100644 ---- a/src/corelib/global/qfloat16.cpp -+++ b/src/corelib/global/qfloat16.cpp -@@ -205,7 +205,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype - #undef f16cextern - } - --#elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) -+#elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) && (__ARM_FP & 2) - static inline bool hasFastF16() - { - return true; diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4de47ca4..5f26e148 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -32,7 +32,6 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0017-qfloat16-check-for-__ARM_FP-2.patch \ file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ file://0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ " @@ -297,4 +296,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "0ab53fbdda2fd7f24f45dcd52fbd195e282554da" +SRCREV = "3a6d8df5219653b043bd642668cee193f563ec84" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 877af34e..2ddfdebe 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "97e9be186913cf1a2857fd34f994fbb74a508c3b" +SRCREV = "0dbc3485d061d27df19c33e2f3fb3abd31bfd0bb" # 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 1b1f5296..c65419dc 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb @@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" DEPENDS += "qtbase" -SRCREV = "7dc2630196197363f1861e23bb8eef6f53074eff" +SRCREV = "ce5087822071d59cedd6913d4b28304aacc3c80b" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 01cea90c..5f6e461f 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "a9b5b10ce113db1c1bb3d42d058caa7b8e1a964a" +SRCREV = "b445ea4ff203fbcb5011adae0236dd028f11bc89" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 0071c368..6d3c6770 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "6b15c2bee08a0477e718a407fdf81917a064c1ca" +SRCREV = "1e5f5525cf811bb0ffca3de389794fa10d2c1af2" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 450b8a55..b588df0e 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -31,6 +31,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "51a158929b55dffbdfb757da8bd6a2cd181906c6" +SRCREV = "23a000f9a14889753a63cd73de2c61e49bb7e0d8" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 686db4c3..33788adb 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "89e9949e720dba11e6f6f05b50c3523a2eca37d7" +SRCREV = "4ea446824de0d3a1bf098c55c28a3440c88ef99c" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 2f875695..57cd049b 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -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 = "4d271e84875a8dc9dd582139e7235497816f9f82" +SRCREV = "337fec3f07fc8c88092b1cdff23cd85c6c3b127b" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index d70ba9de..cda6e670 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "bcced9cb1baefe3507338a602fe95be915798661" +SRCREV = "42486a317119a2df9e25df5b7e548eb61b020607" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 0bca0cc1..ae17b92b 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "bddcb323228191945c9e3a8644cc4307158d4551" +SRCREV = "c910588bee331165350dbd83a9b1fdf92020c2f1" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 21076048..2cbb44a6 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -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 = "bdd1967a3901432eaa6c152eee547e3d322b4a98" +SRCREV_qtlocation = "feb604c32611183083855c04b07c6be1e0efc9c6" SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index bd76f0c6..3b848da2 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "42ec006a0b82ba24eaa13b45e959d85cd9bb0d02" +SRCREV = "798be5abdb7d6e73288780c9ee03c10550dde07d" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index ca36d820..a0a67f05 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "c27f0d93b6034748d311c233020465554bdab79c" +SRCREV = "9548b694a4b04c6164debb821a9c3536860f9421" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index ff4f6572..768ce189 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -38,4 +38,4 @@ 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 = "2091eac697ff6f7be03203d3180633a417c8c58c" +SRCREV = "c012f0a727144714f9480e98938ca8eb2137c213" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index f74a7209..31687baf 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "ada2b06b4523ab7c88e4a5e93f7987f1f0677d4e" +SRCREV = "9f3cdb9e3ece4194af1b374dfde67ce807934325" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index ab715927..fea783b7 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "4a9653f36d528e30989ea4e00a15a6d06a19001f" +SRCREV = "2d99281fe78e6cdcf65d138c8503653ba46eccef" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index cc70705d..cb6b6eff 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "ad9f777a6e40ee95a9d220dcfadfcd4e513fbf2e" +SRCREV = "9ccef69aa67cae578e6725680aa530d3e29fe047" diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index ad032f21..7d3fd78b 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb @@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_qtquick3d = "6f5ec4832188db5e9b5e7e4b5ea5e939b9f4b690" +SRCREV_qtquick3d = "a0197a18cebfb718c1787fcd8779bcf237f97137" SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" SRCREV_FORMAT = "qtquick3d_assimp" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 7d00fd7f..e77e34dc 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "7be5d463e25218a2987d6c1735fd81bc226b29b6" +SRCREV = "bb2b1adffe986843a6e7554bfe5ed26858c66264" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 6d1931a2..b82367a6 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "c8a2a74b2839d9d6c5f8f6f9034470dafc8bcc40" +SRCREV = "8c3882d9391968727c046344e456d1ab2f7b8e08" diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb index 5d030fb1..6db422b4 100644 --- a/recipes-qt/qt5/qtquicktimeline_git.bb +++ b/recipes-qt/qt5/qtquicktimeline_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtbase qtdeclarative" -SRCREV = "7f05ba0039134598dffa17c2ef3e234b5e27241a" +SRCREV = "0df4b2cd85b5d443675c38eb2c55ea6ea12b9174" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 630c93e4..ee7a90df 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "0cb1384479a2ebcbc72a3941462fb3e67aaa884d" +SRCREV = "c64237289a6287c23564827b51092e58a1e6cbac" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index f0f135ca..c796cc40 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 = "77b77e351f0faa3376da330d14236087cc7e6b46" +SRCREV = "bdf42faf19518cf2aceca74f91ab003d204d11be" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 2f153160..efacfcc4 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "acc2d33514d741cde8f67521b4d60e398171f6a8" +SRCREV = "fc0eecb79325713d3576a9d4a7eb359ef90bf3d9" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.14 # 5.14.meta-qt5.1 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 51bf1052..4a971cfc 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "6beffc03d6a55adc06177a2e5d53811c5ab26bc8" +SRCREV = "92e19711f9170f26829498787d0e5de4889c9718" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 97e75234..f1e8b081 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "948edd56ece2f2b5fdcd9fc050efd72e27adcc13" +SRCREV = "4a0bdbfb757d98b7c95ce7a0c299ab19866529e6" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 24fca019..d0229e3d 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "85389370bf5f6c8b560e906c8027713b1858929e" +SRCREV = "30807cadfc8e40097ee6450f667c4510f925bcd2" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index f50b1124..d5864d72 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "3e2823a147b2dca492fece187facfe39f4d33bed" +SRCREV = "63961dd0c73fb6bf7de1b4d3e68fe5d24625a330" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index cfb9e13d..fa42d227 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -49,6 +49,6 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ " -SRCREV = "3300714730761ac23f5c9753071a46685eb87d0e" +SRCREV = "9d5d92a49256af65a85fa69b58e6744c2722321b" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 5b287dfa..9b72798d 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "8b7c8801f2317bef8e21e9080ce242cbb7818a98" +SRCREV = "c14fdb76539156836eb3d1c1a3d6b6875550c24c" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 3a76fc27..1fe9c843 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "e73bd4875d5a07d5357bbcb46d581dd32b3821de" +SRCREV = "bc84e924a2da7ab515900355dcda968d56d1644e" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 966dcd51..fbd1b6f5 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -41,7 +41,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "c2f216ef211ae8fbe0073c296742f584f5493e9f" +SRCREV = "af3976e5e788392ab2b0299c11036c18493d8d40" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index b4991876..f66f2048 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "edaf98129a60fda1d017db805b2e5d63902598ea" +SRCREV = "d2c16a3e7e090c667dbbd409e35df29b498914e0" diff --git a/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch b/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch deleted file mode 100644 index 89014da3..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5f5afe275757efe77ff48debb040e08001ea5907 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 8 Mar 2020 10:51:48 +0100 -Subject: [PATCH] Remove ninja version test for now - it fails for ninja >= - 1.10.x -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As long as upstream has no better solution, assume we have a ninja version -recent enough - -Fixes: -| Found ninja from path: /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/qtwebengine/5.14.1+gitAUTOINC+73d457481c_a9a20127e8-r0/recipe-sysroot-native/usr/bin/ninja -| + /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/qtwebengine/5.14.1+gitAUTOINC+73d457481c_a9a20127e8-r0/recipe-sysroot-native/usr/bin/ninja --version -| > 1.10.0 -| Ninja version too old - -Upstream-Status: Inappropriate [temporary-hack] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - configure.pri | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.pri b/configure.pri -index 3a144e3f..6c3f29fd 100644 ---- a/configure.pri -+++ b/configure.pri -@@ -163,8 +163,7 @@ defineTest(qtConfTest_detectNinja) { - !isEmpty(ninja) { - qtLog("Found ninja from path: $$ninja") - qtRunLoggedCommand("$$ninja --version", version)|return(false) -- contains(version, "1.[7-9].*"): return(true) -- qtLog("Ninja version too old") -+ return(true) - } - qtLog("Building own ninja") - return(false) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 6b54efc6..b49d6cee 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -149,7 +149,6 @@ QT_MODULE_BRANCH_CHROMIUM = "77-based" SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ - file://0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch \ " SRC_URI_append_libc-musl = "\ file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ @@ -190,8 +189,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "73d457481caff493066d9cce50087b56ee506f6a" -SRCREV_chromium = "a9a20127e8adeb3f3cd7921b0bec32083103cc5c" +SRCREV_qtwebengine = "35aa6c30f0e766b8825519e04242b7a4c93b6e0e" +SRCREV_chromium = "6c9be50c2d901e66119679155fb3c7c9200448d1" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index ec10e83e..8c2f5520 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "11324948c1a68233d08726c13571d394b85f4d13" +SRCREV = "55c7e18b7be32a6911631f32d4bfb9029c6ad689" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 21d33e09..0f9107c8 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "ba3acb9d9c7b5234071143d7980576e7eceb6102" +SRCREV = "13c3b3edc5ce65ae65d7ed13cd4484a26fc74188" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index c0ca6118..f08c6ae1 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,7 +19,7 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "94c697c37945dedb37a55c1a9669d868f8c97f41" +SRCREV = "9f479ce719c03035d93323322e646dca79b9dc39" python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 05e32f86..a427e589 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "ea1ce1167fca96a1663ced0d7d6c2da9c20240b9" +SRCREV = "fbed3bc300461823960cfbcb2e1efa80da083b28" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 07967453..b8bc6c84 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,6 +25,6 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "0fa22b3674db3d48bbd0b091b7710158ae152daa" +SRCREV = "45bf71199c6a5f3c070cad52435ac203c6cd480a" BBCLASSEXTEND =+ "native nativesdk" |