diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-05-28 11:53:32 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-06-01 09:39:49 +0300 |
commit | c46b743fd1867e3ad4ecae3b016413fa4e534fd0 (patch) | |
tree | 2d256cd063ed098d1d0e3562e5f76dcd38ecd928 | |
parent | 8b4a01436c10cfd79db28f6462f0769dc7de0539 (diff) | |
download | meta-qt5-c46b743fd1867e3ad4ecae3b016413fa4e534fd0.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.15 branch.
Notes:
- qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
included in qtbase
- qtdeclarative/0002-Use-python3-explicitly.patch removed
due QTBUG-84038
Task-number: QTBUG-84150
Change-Id: I183d3d9ed73febd09407ab241af88f707473bca0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
45 files changed, 44 insertions, 175 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 4129681c..4d7fab80 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -41,7 +41,6 @@ SRC_URI += "\ | |||
41 | file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 41 | file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
42 | file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ | 42 | file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ |
43 | file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 43 | file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
44 | file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ | ||
45 | file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ | 44 | file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ |
46 | " | 45 | " |
47 | 46 | ||
@@ -196,4 +195,4 @@ fakeroot do_generate_qt_environment_file() { | |||
196 | do_generate_qt_environment_file[umask] = "022" | 195 | do_generate_qt_environment_file[umask] = "022" |
197 | addtask generate_qt_environment_file after do_install before do_package | 196 | addtask generate_qt_environment_file after do_install before do_package |
198 | 197 | ||
199 | SRCREV = "ba3b53cb501a77144aa6259e48a8e0edc3d1481d" | 198 | SRCREV = "d1361b1443578550e5c31c0e52aa237c5e1cc6e0" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 496f6ae7..d94018a3 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -36,6 +36,6 @@ do_configure_prepend() { | |||
36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
37 | } | 37 | } |
38 | 38 | ||
39 | SRCREV = "5e16aa067ac6a8b5f031ffcefc356777a0da34ad" | 39 | SRCREV = "9d9305184ea0b19809baac844ae32bf9323d19d2" |
40 | 40 | ||
41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index b0389949..862eeb18 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" | |||
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | PV = "5.15.0+git${SRCPV}" | 17 | PV = "5.15.1+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 2a40a984..16aa8554 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -36,7 +36,6 @@ SRC_URI += "\ | |||
36 | file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 36 | file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
37 | file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ | 37 | file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ |
38 | file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 38 | file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
39 | file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ | ||
40 | file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ | 39 | file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ |
41 | " | 40 | " |
42 | 41 | ||
@@ -143,4 +142,4 @@ do_install() { | |||
143 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
144 | } | 143 | } |
145 | 144 | ||
146 | SRCREV = "ba3b53cb501a77144aa6259e48a8e0edc3d1481d" | 145 | SRCREV = "d1361b1443578550e5c31c0e52aa237c5e1cc6e0" |
diff --git a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch deleted file mode 100644 index 133c43bb..00000000 --- a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | From b9b6172194de411c2c68e81c427a79b0a1227e3e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 25 Nov 2019 08:27:39 -0800 | ||
4 | Subject: [PATCH] input: Make use of timeval portable for 64bit time_t | ||
5 | |||
6 | This patch avoids using time field of input_event structure which is not available | ||
7 | on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new | ||
8 | and keeps old input.h implementation functional as well. | ||
9 | |||
10 | See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign | ||
11 | Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610] | ||
12 | Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 | ||
13 | --- | ||
14 | .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++- | ||
15 | .../input/evdevtouch/qevdevtouchhandler.cpp | 7 ++++++- | ||
16 | 2 files changed, 15 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | ||
19 | index 3555763b89..e7dc57c027 100644 | ||
20 | --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | ||
21 | +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | ||
22 | @@ -58,6 +58,11 @@ | ||
23 | #include <linux/input.h> | ||
24 | #endif | ||
25 | |||
26 | +#ifndef input_event_sec | ||
27 | +#define input_event_sec time.tv_sec | ||
28 | +#define input_event_usec time.tv_usec | ||
29 | +#endif | ||
30 | + | ||
31 | QT_BEGIN_NAMESPACE | ||
32 | |||
33 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") | ||
34 | @@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state) | ||
35 | qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); | ||
36 | |||
37 | struct ::input_event led_ie; | ||
38 | - ::gettimeofday(&led_ie.time, 0); | ||
39 | + struct timeval tval; | ||
40 | + ::gettimeofday(&tval, 0); | ||
41 | + led_ie.input_event_sec = tval.tv_sec; | ||
42 | + led_ie.input_event_usec = tval.tv_usec; | ||
43 | led_ie.type = EV_LED; | ||
44 | led_ie.code = led; | ||
45 | led_ie.value = state; | ||
46 | diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | ||
47 | index 78728ef4ce..1d65f9b9f7 100644 | ||
48 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | ||
49 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | ||
50 | @@ -58,6 +58,11 @@ | ||
51 | #include <linux/input.h> | ||
52 | #endif | ||
53 | |||
54 | +#ifndef input_event_sec | ||
55 | +#define input_event_sec time.tv_sec | ||
56 | +#define input_event_usec time.tv_usec | ||
57 | +#endif | ||
58 | + | ||
59 | #include <math.h> | ||
60 | |||
61 | #if QT_CONFIG(mtdev) | ||
62 | @@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) | ||
63 | |||
64 | // update timestamps | ||
65 | m_lastTimeStamp = m_timeStamp; | ||
66 | - m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0; | ||
67 | + m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0; | ||
68 | |||
69 | m_lastTouchPoints = m_touchPoints; | ||
70 | m_touchPoints.clear(); | ||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index e00fe86f..fab0616f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -32,7 +32,6 @@ SRC_URI += "\ | |||
32 | file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 32 | file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
33 | file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ | 33 | file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ |
34 | file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 34 | file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
35 | file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ | ||
36 | file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ | 35 | file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ |
37 | " | 36 | " |
38 | 37 | ||
@@ -296,4 +295,4 @@ sed -i \ | |||
296 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 295 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
297 | } | 296 | } |
298 | 297 | ||
299 | SRCREV = "ba3b53cb501a77144aa6259e48a8e0edc3d1481d" | 298 | SRCREV = "d1361b1443578550e5c31c0e52aa237c5e1cc6e0" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 987acda8..61c35881 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
10 | 10 | ||
11 | SRCREV = "785a8d7118c4dd6117dd085bbe2da6e4bc717654" | 11 | SRCREV = "b1edcbc8b040455b76b1ac3c1762867c88e76287" |
12 | 12 | ||
13 | # The same issue as in qtbase: | 13 | # The same issue as in qtbase: |
14 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index b360a1e0..f0fa7df7 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb | |||
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" | |||
11 | 11 | ||
12 | DEPENDS += "qtbase" | 12 | DEPENDS += "qtbase" |
13 | 13 | ||
14 | SRCREV = "e4ea8435edcf7807372c21bdf460254bdc7d97a6" | 14 | SRCREV = "4ba91c4d09b8a476c335c8f0725d4a8aba651ae5" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index ad558468..95dc95c8 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" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "eb908370e0c8212cf81f080f4bdbf663273b8063" | 22 | SRCREV = "ac95e67f071e7ee8fb1d65d1a4fe1b68ceee7c2d" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index c7cc6268..5c1bcea9 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
10 | 10 | ||
11 | SRCREV = "d15ace0300d035283a7137e3a6e9a412ff53d019" | 11 | SRCREV = "8ea21240c33ded74bc30f1dd2accf5718eb07574" |
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch deleted file mode 100644 index f55812b6..00000000 --- a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | From 838fb4676f78d169dc88f87544cf1a4003302aea Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 26 Nov 2019 21:10:03 -0800 | ||
4 | Subject: [PATCH] Use python3 explicitly | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | qtdeclarative.pro | 2 +- | ||
9 | src/3rdparty/masm/masm.pri | 4 ++-- | ||
10 | tests/auto/qml/ecmascripttests/test262.py | 2 +- | ||
11 | 3 files changed, 4 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/qtdeclarative.pro b/qtdeclarative.pro | ||
14 | index 5b94da9b69..0e3496ce80 100644 | ||
15 | --- a/qtdeclarative.pro | ||
16 | +++ b/qtdeclarative.pro | ||
17 | @@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools | ||
18 | load(qt_parts) | ||
19 | |||
20 | !python_available { | ||
21 | - py_out = $$system('python -c "print(1)"') | ||
22 | + py_out = $$system('python3 -c "print(1)"') | ||
23 | !equals(py_out, 1): error("Building QtQml requires Python.") | ||
24 | tmp = python_available | ||
25 | CONFIG += $$tmp | ||
26 | diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri | ||
27 | index 1df4585aae..00038104ec 100644 | ||
28 | --- a/src/3rdparty/masm/masm.pri | ||
29 | +++ b/src/3rdparty/masm/masm.pri | ||
30 | @@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) { | ||
31 | udis86.output = udis86_itab.h | ||
32 | udis86.input = ITAB | ||
33 | udis86.CONFIG += no_link | ||
34 | - udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} | ||
35 | + udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} | ||
36 | QMAKE_EXTRA_COMPILERS += udis86 | ||
37 | |||
38 | udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c | ||
39 | @@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h | ||
40 | retgen.script = $$PWD/yarr/create_regex_tables | ||
41 | retgen.input = retgen.script | ||
42 | retgen.CONFIG += no_link | ||
43 | -retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} | ||
44 | +retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT} | ||
45 | QMAKE_EXTRA_COMPILERS += retgen | ||
46 | |||
47 | # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
48 | diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py | ||
49 | index 19551e3ba2..bf3f79a45f 100755 | ||
50 | --- a/tests/auto/qml/ecmascripttests/test262.py | ||
51 | +++ b/tests/auto/qml/ecmascripttests/test262.py | ||
52 | @@ -1,4 +1,4 @@ | ||
53 | -#!/usr/bin/env python | ||
54 | +#!/usr/bin/env python3 | ||
55 | ############################################################################# | ||
56 | ## | ||
57 | ## Copyright (C) 2017 The Qt Company Ltd. | ||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 4304e1f6..048b0039 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = " \ | |||
16 | # 5.14.meta-qt5.1 | 16 | # 5.14.meta-qt5.1 |
17 | SRC_URI += " \ | 17 | SRC_URI += " \ |
18 | file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ | 18 | file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ |
19 | file://0002-Use-python3-explicitly.patch \ | ||
20 | " | 19 | " |
21 | 20 | ||
22 | DEPENDS += "qtbase qtdeclarative-native" | 21 | DEPENDS += "qtbase qtdeclarative-native" |
@@ -31,6 +30,6 @@ do_install_append_class-nativesdk() { | |||
31 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 30 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
32 | } | 31 | } |
33 | 32 | ||
34 | SRCREV = "5a3d9309ec018445a3471d40366f41ee2f6ebef7" | 33 | SRCREV = "b52e81856a1d50fc331b99ae533a474a9b4e79c3" |
35 | 34 | ||
36 | BBCLASSEXTEND =+ "native nativesdk" | 35 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 3347c9c4..9f3a5dc5 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" | |||
14 | 14 | ||
15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
16 | 16 | ||
17 | SRCREV = "b036b587216d89a0bf27f4e11ae4f453e8cce766" | 17 | SRCREV = "f1e9844fa72f755efdf52040cd08844a7a46a3e7" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 2891d7c1..56ca61ca 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" | |||
18 | # http://errors.yoctoproject.org/Errors/Build/44912/ | 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ |
19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
20 | 20 | ||
21 | SRCREV = "18f17fed89e1fd381ba9c3bf9a7b64d88cb62ad7" | 21 | SRCREV = "83e9a15a523e86718f99d47d5b3b516ab95d5ae2" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 30eb3664..81d82665 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" | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "b26e5fbf4c50b70ec773a0265c27bb3b262c71ed" | 28 | SRCREV = "1a790ba6151a3128b49d3dc556d3373dbda9f9d1" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index e559ef69..21571dd3 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "5b93f9b339fce9097ea4a13494a81ec284b7adf2" | 12 | SRCREV = "c07f75ac7740d80a36ff486edc69df41d7d495e4" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index e2900e42..6ebbfa06 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -35,7 +35,7 @@ SRC_URI += " \ | |||
35 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 35 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
36 | " | 36 | " |
37 | 37 | ||
38 | SRCREV_qtlocation = "b2d0a90961089057acf199119afa8235e9e926b3" | 38 | SRCREV_qtlocation = "e73246b0e575a14bd88a84f67543b7e9b50960d5" |
39 | SRCREV_qtlocation-mapboxgl = "d7e368c42f2ac7971e81f60b981e566352f1e4fa" | 39 | SRCREV_qtlocation-mapboxgl = "d7e368c42f2ac7971e81f60b981e566352f1e4fa" |
40 | 40 | ||
41 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 41 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index 9e964298..fdddc750 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase qtdeclarative" | 10 | DEPENDS += "qtbase qtdeclarative" |
11 | 11 | ||
12 | SRCREV = "eeac38075b17ae74821e9976d3dd37346a4f822c" | 12 | SRCREV = "a0918d137c318d8c9cad6f7db1ffca1f18c305c6" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index c5b6b66c..aeb9e0aa 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "9ae8940b5e1870373c73dec4deadf761b7c1bfd1" | 12 | SRCREV = "e6c2ddfc2a01c0cc4e3b5790b0de2a7dc3947581" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index a0e91f13..e8013ea7 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -38,7 +38,7 @@ SRC_URI += "\ | |||
38 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 38 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
40 | 40 | ||
41 | SRCREV = "83f0038fa7fd090840fdd19fd30652bd7bbb6fd3" | 41 | SRCREV = "89f92578ece66aaa50e03cacd81434cd18006185" |
42 | 42 | ||
43 | # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory | 43 | # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory |
44 | do_install_append() { | 44 | do_install_append() { |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index cb1b63b7..ca65ca3d 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb | |||
@@ -9,4 +9,4 @@ require qt5-git.inc | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "8e6e45b990a0ad9bc0d43f1f5387d34a212441bd" | 12 | SRCREV = "9f6f71d7b1eaf7821a0083894863b1b3d2a1e3ef" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 56e7f6d6..49e519c9 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" | |||
18 | 18 | ||
19 | DEPENDS += "qtbase" | 19 | DEPENDS += "qtbase" |
20 | 20 | ||
21 | SRCREV = "c042427a43a1a911f571626acb681c66059f33a6" | 21 | SRCREV = "8e3774cf88ba086c12df4ac14da6b7c91bfa333c" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 54d62890..f959b41c 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "231e7e55e9bb8a70bbb2c43ed3e92804ff5577b2" | 13 | SRCREV = "ac5a9b9615ba80e5b7b57c689cfba2b657b4e612" |
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index a3e9226a..97a0796e 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb | |||
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \ | |||
21 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ | 21 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ |
22 | " | 22 | " |
23 | 23 | ||
24 | SRCREV_qtquick3d = "c9073f11ba540353aa5e3a6f8653569daf9ed606" | 24 | SRCREV_qtquick3d = "54d800707808ccdb2d7f17e72f6fd9429573b8fd" |
25 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" | 25 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" |
26 | 26 | ||
27 | SRCREV_FORMAT = "qtquick3d_assimp" | 27 | SRCREV_FORMAT = "qtquick3d_assimp" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index e14960aa..c6525399 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "e2768b6d054c62c21a343fe25557d3ff9e45d1d1" | 13 | SRCREV = "7f820ab2949dd6f0595b916192279745aafe4d71" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 3fde4f97..d2021344 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ | |||
17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "c9b0270985a64c9682ddf304d18a18dfb18c8944" | 20 | SRCREV = "e5fb9e4ceabc2f1bfd89d3b3cb0a69c7d74df5b8" |
diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb index 4de1159b..93618935 100644 --- a/recipes-qt/qt5/qtquicktimeline_git.bb +++ b/recipes-qt/qt5/qtquicktimeline_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS = "qtbase qtdeclarative" | 11 | DEPENDS = "qtbase qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "e40206c703c57f3c98263a7481597dfced5db6c1" | 13 | SRCREV = "e993bd51b8a6a4dcab9303b9e1991a271e086c60" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index ed14696e..33f02e6a 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" | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "f68928c439fac00b27e85c9ae3f7e3ec0dca2221" | 28 | SRCREV = "be49da7ec275e4fbbc678810bf7264197099eeee" |
29 | 29 | ||
30 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 0b6e36da..112e6964 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -36,4 +36,4 @@ DEPENDS += "qtbase" | |||
36 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 36 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
38 | 38 | ||
39 | SRCREV = "ebd4605c712941030edac8f5b7c32971e9541f7a" | 39 | SRCREV = "0f6ea3515260438b3a51bc6e4d4e4480261484ff" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 48433e9d..e01c5163 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
@@ -10,7 +10,7 @@ require qt5-git.inc | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
12 | 12 | ||
13 | SRCREV = "e72ad1f088d054678b7d70133fe702d91ae6b366" | 13 | SRCREV = "a11be67255140abd48f91a3d5f7ae4c3ee8e4341" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.14 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.14 |
16 | # 5.14.meta-qt5.1 | 16 | # 5.14.meta-qt5.1 |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 72436875..dd2be49d 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
14 | 14 | ||
15 | SRCREV = "b084dc36e39d74e1e1039ecfac345c9b54964f40" | 15 | SRCREV = "be24a7a43cfe4db4c9a9d95f9321c8abec3b0ae7" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 2b8505a5..b22761cc 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "b12bc31046b29d67a59ab6b28cbc61e03dea0712" | 14 | SRCREV = "c12af8832389785b8be7ffcdddcdb8480c1e124d" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index d7b1ad1c..f6bb9c19 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "1c736fefa6dd8868610ff9ae59cd7552f1c7a891" | 15 | SRCREV = "49335de3e7690ae6d7992dace29b86ef4ae246d1" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index c10ba237..2914ceea 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "e12485f69e12fc382174a8d081fcb88c3567a4d3" | 15 | SRCREV = "c2d3f2833a3480d1254233a1c2a567b4e6b8bfdd" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 2490d4e6..6d924526 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -49,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\ | |||
49 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ | 49 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ |
50 | " | 50 | " |
51 | 51 | ||
52 | SRCREV = "94e861104a1d689dfd12018e7be377699ab24917" | 52 | SRCREV = "e1c5282d9f97bc2068107d4625933c7fefb9f0cc" |
53 | 53 | ||
54 | BBCLASSEXTEND = "native nativesdk" | 54 | BBCLASSEXTEND = "native nativesdk" |
55 | 55 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 0d166a22..855d8ad3 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ | |||
98 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ | 98 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ |
99 | " | 99 | " |
100 | 100 | ||
101 | SRCREV = "b0be8ca652f732439e562f75be372730e2452042" | 101 | SRCREV = "132bdb78342692f6f0ad2a6c703d9a67dc0227f0" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 63a8bdfa..78c69bc8 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" | |||
71 | 71 | ||
72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
73 | 73 | ||
74 | SRCREV = "4286d326885d629421c6d5511db8f9f619cc83f8" | 74 | SRCREV = "4cf279a5e6ad49720506a6825f008a773f5e951e" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 18fa8d09..ed825a40 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -43,7 +43,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu | |||
43 | 43 | ||
44 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 44 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
45 | 45 | ||
46 | SRCREV = "efc94a48526baf92b8a78916e03e1fef5993fa95" | 46 | SRCREV = "7a74426e10d209f716114c14d658cc6086f9023a" |
47 | 47 | ||
48 | BBCLASSEXTEND =+ "native nativesdk" | 48 | BBCLASSEXTEND =+ "native nativesdk" |
49 | 49 | ||
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 3718b78a..2f041a1d 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtdeclarative qtwebsockets" | 13 | DEPENDS += "qtdeclarative qtwebsockets" |
14 | 14 | ||
15 | SRCREV = "bb144ebca2ea2fda8f2ee75e233979e6df2d37c6" | 15 | SRCREV = "3342da908955187a4543cdc38e0fad2e78e936e7" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index bced1e4e..16958528 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -190,8 +190,8 @@ SRC_URI_append_libc-musl = "\ | |||
190 | file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ | 190 | file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ |
191 | " | 191 | " |
192 | 192 | ||
193 | SRCREV_qtwebengine = "387fb9377d61683bcd0f59a637afffdd9a16912c" | 193 | SRCREV_qtwebengine = "f2db8f1988a3767d4f35aa4724d4e168e80dad59" |
194 | SRCREV_chromium = "623647821aa7c7565ed5153a27c5a1bb088efbe6" | 194 | SRCREV_chromium = "7b2f027ea83c372c33d5b50deb65a2d98244aa04" |
195 | SRCREV = "${SRCREV_qtwebengine}" | 195 | SRCREV = "${SRCREV_qtwebengine}" |
196 | 196 | ||
197 | SRCREV_FORMAT = "qtwebengine_chromium" | 197 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 2fed4083..584b7220 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb | |||
@@ -18,4 +18,4 @@ do_configure_prepend() { | |||
18 | 18 | ||
19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
20 | 20 | ||
21 | SRCREV = "f1327aa34c68b1536247c37925a3cbb255f6f27a" | 21 | SRCREV = "5488f0731ebe9c5566abb897f0cb8d298c5944da" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index a1861a53..a6abb723 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "6efa2ea5fd6eb35fd07b97f643d1e8e376f2eda0" | 14 | SRCREV = "34010e649734fe7a41d1a0280c606b15de5c2799" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index adaeae10..29367e38 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -23,4 +23,4 @@ python() { | |||
23 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | 23 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): |
24 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') | 24 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') |
25 | } | 25 | } |
26 | SRCREV = "d2e2dbeaf681a5a1b79808e1ed982ae6e4563ae4" | 26 | SRCREV = "1b514c3b7d1b5d6ddfbfd818cf878a425d2b5f8b" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 0717faf5..00ab8b8d 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "306a2b20a8792079faf6dae864161f1b5cc6646f" | 15 | SRCREV = "17a9d40a3e808145aef8de08b79d21cf7df45421" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 712681c0..10abd4c6 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -25,6 +25,6 @@ do_configure_prepend() { | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
27 | 27 | ||
28 | SRCREV = "af8b0cfdc85d593eb63eb9fe4d61b61ba6382e9d" | 28 | SRCREV = "0c04a447ca53642e33fde1f4ada6debc435837e7" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |