diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-04-29 15:27:49 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-05-02 07:57:44 +0000 |
commit | e990651e683b47e60fc981dc4edb285a795ae490 (patch) | |
tree | 3161f4634cbfb541dcababc7a4e8494d4ddaa0a4 | |
parent | a2158ae2f8e347335b0e96f5524f173078819eee (diff) | |
download | meta-qt5-e990651e683b47e60fc981dc4edb285a795ae490.tar.gz |
qt5: Update to Qt 5.14 from dev branch
Change-Id: Ie028c02cb79b7315ca58a81db311a8e839612284
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
43 files changed, 59 insertions, 58 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index f92f710e..3f2cf6ae 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { | |||
193 | do_generate_qt_environment_file[umask] = "022" | 193 | do_generate_qt_environment_file[umask] = "022" |
194 | addtask generate_qt_environment_file after do_install before do_package | 194 | addtask generate_qt_environment_file after do_install before do_package |
195 | 195 | ||
196 | SRCREV = "12b96dbb81a1a7bc5ffc08c24942038b007985e9" | 196 | SRCREV = "8f44aeb10317664dd7cae92e628fb0814e432e17" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 7f7e964d..fc1a743e 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 = "276be935bfeccde733bacd4267abeb978f6efda5" | 39 | SRCREV = "100175e92d6adb346169eda0392b9485ca41a905" |
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 6641a4f6..dce2c17b 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -2,7 +2,7 @@ | |||
2 | # Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> |
3 | 3 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.13" | 5 | QT_MODULE_BRANCH ?= "dev" |
6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" |
7 | 7 | ||
8 | # each module needs to define valid SRCREV | 8 | # each module needs to define valid SRCREV |
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" | |||
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | PV = "5.13.0+git${SRCPV}" | 17 | PV = "5.14.0+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index a50b6eaf..78410f32 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -139,4 +139,4 @@ do_install() { | |||
139 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 139 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
140 | } | 140 | } |
141 | 141 | ||
142 | SRCREV = "12b96dbb81a1a7bc5ffc08c24942038b007985e9" | 142 | SRCREV = "8f44aeb10317664dd7cae92e628fb0814e432e17" |
diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch index 4ecbef82..8b8e8d5d 100644 --- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch +++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 25fe85b199ab52bfa0a2e4c1da41fee1f4a26fbe Mon Sep 17 00:00:00 2001 | 1 | From 6b0dfb84eca369a791a0c038b9294d2f9c78bab5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 14 Feb 2018 17:08:43 -0800 | 3 | Date: Wed, 14 Feb 2018 17:08:43 -0800 |
4 | Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem | 4 | Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem |
@@ -22,20 +22,20 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
22 | 2 files changed, 2 insertions(+), 2 deletions(-) | 22 | 2 files changed, 2 insertions(+), 2 deletions(-) |
23 | 23 | ||
24 | diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf | 24 | diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf |
25 | index 5800aaa5b4..7b4901ce46 100644 | 25 | index aead581478..8e06a069b4 100644 |
26 | --- a/mkspecs/common/clang.conf | 26 | --- a/mkspecs/common/clang.conf |
27 | +++ b/mkspecs/common/clang.conf | 27 | +++ b/mkspecs/common/clang.conf |
28 | @@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX | 28 | @@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch |
29 | CONFIG += clang_pch_style | 29 | |
30 | QMAKE_PCH_OUTPUT_EXT = .pch | 30 | QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz |
31 | 31 | ||
32 | -QMAKE_CFLAGS_ISYSTEM = -isystem | 32 | -QMAKE_CFLAGS_ISYSTEM = -isystem |
33 | +QMAKE_CFLAGS_ISYSTEM = | 33 | +QMAKE_CFLAGS_ISYSTEM = |
34 | QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | 34 | QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} |
35 | QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} | 35 | QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} |
36 | QMAKE_CFLAGS_LTCG = -flto | 36 | QMAKE_CFLAGS_LTCG = -flto=thin |
37 | diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf | 37 | diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf |
38 | index c2669e4833..3fde8dc85f 100644 | 38 | index 44b4267207..9756a02014 100644 |
39 | --- a/mkspecs/common/gcc-base.conf | 39 | --- a/mkspecs/common/gcc-base.conf |
40 | +++ b/mkspecs/common/gcc-base.conf | 40 | +++ b/mkspecs/common/gcc-base.conf |
41 | @@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g | 41 | @@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 0d1a306f..2e7eae4b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -263,4 +263,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
263 | 263 | ||
264 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 264 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
265 | 265 | ||
266 | SRCREV = "12b96dbb81a1a7bc5ffc08c24942038b007985e9" | 266 | SRCREV = "8f44aeb10317664dd7cae92e628fb0814e432e17" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index cf28db5f..336f51db 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 = "beda274e7d8b5a6864b254a9e63b654f3c494139" | 11 | SRCREV = "4618124ada61c28eefc3ab89fd151c0f9fbbba71" |
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 e638c523..1840d52d 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase" | 9 | DEPENDS += "qtbase" |
10 | 10 | ||
11 | SRCREV = "cf5699e4050b200b9ee80bf4a1c8fbcecb2877af" | 11 | SRCREV = "838cfa5aec4c02f5e865fc470c10cc50eb42f2c8" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 15e33eb3..afdce9d5 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" | |||
21 | 21 | ||
22 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 22 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
23 | 23 | ||
24 | SRCREV = "d37dbf7727e1e7f3dce70d5855ec407e2e8a6e54" | 24 | SRCREV = "21bfb7620f3cdcaf3d2b7c0b8a2294e174c7053b" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 56aafa95..ffe88707 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 = "7dc2d9302347b87993f5cfed4be5d6b9c3e130bc" | 11 | SRCREV = "afe8f78d360eab894e6e85ecd72c75d8f365e6bb" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 34a10e66..04d86f46 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { | |||
24 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 24 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
25 | } | 25 | } |
26 | 26 | ||
27 | SRCREV = "8bc3329e2cec4638fa9af274a40dda176bbb7352" | 27 | SRCREV = "2ccd4c3672e5db2c25ca0f8df439fe8f646aa942" |
28 | 28 | ||
29 | BBCLASSEXTEND =+ "native nativesdk" | 29 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index ebc273e7..33ff924e 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 = "df36f287894dca61486b6769866718688cce12f3" | 17 | SRCREV = "3cf4be211ad58425d89c238b23bec5cedd79c111" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index a27e99ad..747c34b2 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 = "085275b92a55a21cbcf8d307a6f52804875deedd" | 21 | SRCREV = "c6fe3e3be58efa4002876ad2b5c811355d1b21f0" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index f7892836..36985903 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 = "5fba848889ade8eb067b8a54011e20e9d59b4738" | 28 | SRCREV = "155410fd6369ceafccb865a9d0fe2169c63a7368" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index cb9b3eb1..16caaa76 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 = "60d096199945d39aad92384e3ba9a47be406d650" | 12 | SRCREV = "07940838ab5d65565d4b67bdffbcf68d020fb725" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 5003dd94..d0b443ee 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -31,7 +31,7 @@ SRC_URI += " \ | |||
31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
32 | " | 32 | " |
33 | 33 | ||
34 | SRCREV_qtlocation = "b392921e33b4e8d425f1881afb95e6d34e53879c" | 34 | SRCREV_qtlocation = "5c53cd23351a1850f170dcf2fdcab7545cac3ddc" |
35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" | 35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" |
36 | 36 | ||
37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index 541ca55f..03834107 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 = "553ec1bc799f344a12e34c91720e13a469d85365" | 12 | SRCREV = "80151882a9a806f5fdbb700fd6a0db1300d9d5e0" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index b77f5b65..568ec02f 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 = "c8a837521b92082d47f986f61ec9ec0263146b7c" | 12 | SRCREV = "5b8ae24da570f61123e14b6f84eb6bab41ac8a29" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 4433fd85..f632abc0 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -37,4 +37,4 @@ SRC_URI += "\ | |||
37 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
39 | 39 | ||
40 | SRCREV = "d97d618a4884c2535ba787e774f0faa6bce82081" | 40 | SRCREV = "2755dcf670f8b40ec2f3ecce356b378db08da872" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index f03ec6e2..d17b6c4a 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 = "cf5741a44a6c337fa523080838d8e9220f4370c1" | 12 | SRCREV = "2b1e9bfec5b6017f3e16dfc6c8df94523aefe286" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index ed3046f5..2e0ba464 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase" | 11 | DEPENDS += "qtbase" |
12 | 12 | ||
13 | SRCREV = "61a2c26fe8831a0a743efd0e179bbe9bf9425235" | 13 | SRCREV = "bad55c664152eef404f7bf908cae0abfdc9a7b46" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 692a4b70..a41f11dc 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 = "12c4da762bd29399767538ca716189908e41cc5a" | 13 | SRCREV = "0992ba9d0c78ab99fe7387d1e53cad0e9db0ff45" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 6fbc018e..198c62fd 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 = "ced7d5af9caeedd7b3a2278b052a0b0f7bf951b7" | 13 | SRCREV = "d1fdbd128f6e95255c7d9fc20ef07f44677a649e" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 2eb450e8..77e3f50a 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 = "3d44442331ba6f1ba7a5d5ad9f3834993911e288" | 20 | SRCREV = "bdff4debf5f3f8125e3b7876bb5c62bc4251727f" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 2e6998ea..ff9b513f 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
24 | 24 | ||
25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
26 | 26 | ||
27 | SRCREV = "cb9a20c50584eaf950c1fc9a7fd7961a92100046" | 27 | SRCREV = "6272bab4eb61f39cfe4ada059f528c8d00246732" |
28 | 28 | ||
29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index aa4b7daf..5c80601c 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 = "8d2c11ac2352556167dc4a86172cd9bc3a979ed8" | 39 | SRCREV = "fc99750865129c3abe9c827dd136ab717a7f4601" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index c97fc172..e785c9f5 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 = "acddb0676cafdc83edd08aee87181bf5602d6387" | 13 | SRCREV = "96b435525b17f1e16be953e01cd1f573e4342c2f" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 |
16 | # 5.12.meta-qt5.1 | 16 | # 5.12.meta-qt5.1 |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 81802fd6..6fc20a87 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 = "d1a1b62914d592bf0bb382accff29abc610d3fab" | 15 | SRCREV = "9b309ffa389f58f3a87bf132e123ae78aee808a3" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 6b32ef11..1da60667 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 = "fe80eef6b3377c8727c5190d275808c343ee7c75" | 14 | SRCREV = "960861ac561f4bd4d8ce4fbe6d0643482d961f11" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index af437ef8..9fad00ed 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 = "f47d1b9a11eb8c56afbd929285724f795097da09" | 15 | SRCREV = "f03f1476fb1d95dff3dab3ecf2db8ca6edb0e013" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 06cee877..f161dcbc 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 = "2043a358ea64fe220e0fdee09d1f3aa1fd6aaad7" | 15 | SRCREV = "798f3010b1b6fe14b3bb56f136b7f126b8144398" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 7029f8bf..757d34dc 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
33 | " | 33 | " |
34 | 34 | ||
35 | SRCREV = "1562cf0d6129886e16c57ac72fab00b309db6bc6" | 35 | SRCREV = "2ba9cc9aad6fbd950ac4aa090f6480a500679ea2" |
36 | 36 | ||
37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 2206399e..de74f4fb 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 = "133f635a25ee58596fcb556b87e841257390758b" | 101 | SRCREV = "66952c79bc648e1074936dddb7fa2cffc17b1777" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index b9ba2b4e..0be2982d 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
49 | 49 | ||
50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
51 | 51 | ||
52 | SRCREV = "67e497ff407441515761b312599cb4ad6b61adad" | 52 | SRCREV = "039e3e85f9c3b4cd4980fa944e321f7009b93fd0" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 8e1e6748..84fc86e6 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris | |||
37 | 37 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "458bc86f82f8fa6cfd659950549d1d2b36e5e40d" | 40 | SRCREV = "838de08ed24c947be9ea3c311afc1556e62be9fc" |
41 | 41 | ||
42 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
43 | 43 | ||
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 34f52528..4cab7877 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 = "24e0c897fac375514396191db7b582505028c918" | 15 | SRCREV = "aa490ada3793fc3528bdfefb90479c711cc0c325" |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch index 73d838b6..77c15b1c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 99660440fb4e876fe6c008f37fb70fce9cb61b9b Mon Sep 17 00:00:00 2001 | 1 | From 11c7288eca77725a6c461c8dbf953a72228cba08 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 5 Feb 2019 14:32:20 -0800 | 3 | Date: Tue, 5 Feb 2019 14:32:20 -0800 |
4 | Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm | 4 | Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm |
@@ -11,23 +11,24 @@ src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to | |||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | --- | 13 | --- |
14 | chromium/third_party/zlib/BUILD.gn | 5 ++++- | 14 | chromium/third_party/zlib/BUILD.gn | 6 ++++-- |
15 | 1 file changed, 4 insertions(+), 1 deletion(-) | 15 | 1 file changed, 4 insertions(+), 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn | 17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn |
18 | index 458f428..18b4f23 100644 | 18 | index 458f428b7ce..e82d24aa9bb 100644 |
19 | --- a/chromium/third_party/zlib/BUILD.gn | 19 | --- a/chromium/third_party/zlib/BUILD.gn |
20 | +++ b/chromium/third_party/zlib/BUILD.gn | 20 | +++ b/chromium/third_party/zlib/BUILD.gn |
21 | @@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { | 21 | @@ -74,9 +74,11 @@ if (use_arm_neon_optimizations) { |
22 | # implement the CRC32* instructions. These are optional in ARMv8.0." | 22 | # implement the CRC32* instructions. These are optional in ARMv8.0." |
23 | # - Fuchsia just added a syscall for feature detection. | 23 | # - Fuchsia just added a syscall for feature detection. |
24 | # TODO(cavalcantii): crbug.com/810125. | 24 | # TODO(cavalcantii): crbug.com/810125. |
25 | + defines = [] | 25 | + defines = [] |
26 | if (is_clang && (!is_ios && !is_fuchsia)) { | 26 | if (is_clang && (!is_ios && !is_fuchsia)) { |
27 | - defines = [ "CRC32_ARMV8_CRC32" ] | 27 | - defines = [ "CRC32_ARMV8_CRC32" ] |
28 | - if (is_android) { | ||
28 | + if (current_cpu == "arm64") { | 29 | + if (current_cpu == "arm64") { |
29 | + defines += [ "CRC32_ARMV8_CRC32" ] | 30 | + defines += [ "CRC32_ARMV8_CRC32" ] |
30 | + } | 31 | + } if (is_android) { |
31 | if (is_android) { | ||
32 | defines += [ "ARMV8_OS_ANDROID" ] | 32 | defines += [ "ARMV8_OS_ANDROID" ] |
33 | } else if (is_linux || is_chromeos) { | 33 | } else if (is_linux || is_chromeos) { |
34 | defines += [ "ARMV8_OS_LINUX" ] | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 98bc26a9..2277a6b7 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -171,8 +171,8 @@ SRC_URI_append_libc-musl = "\ | |||
171 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 171 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
172 | " | 172 | " |
173 | 173 | ||
174 | SRCREV_qtwebengine = "5de670283e3093fcdd2a91dcca30ffbe0b03d230" | 174 | SRCREV_qtwebengine = "aef55c4091f252231718369b382dd8f401f206e3" |
175 | SRCREV_chromium = "4679cc537c8358afa61918d119ceb629593a4d4d" | 175 | SRCREV_chromium = "3d95374cb8de20b3e15538f1ecb5b78bf9d1cdcb" |
176 | SRCREV = "${SRCREV_qtwebengine}" | 176 | SRCREV = "${SRCREV_qtwebengine}" |
177 | 177 | ||
178 | SRCREV_FORMAT = "qtwebengine_chromium" | 178 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 2e5dc217..e34c705c 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 = "c21dbf122e57ee90436de65a7f868fd8ce5a377b" | 21 | SRCREV = "2f419ac89db34d1d3b9ee2e6579a36dfcc36acc3" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index f5fdabf0..e42c8d9f 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 = "74c8ebe9696c981311f19bdd6544634ab1b7cc7f" | 14 | SRCREV = "6dd15c9f1bfdc010e4cd4b8158435063a5a7d229" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 4766f9da..7966816a 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
21 | 21 | ||
22 | SRCREV = "d895829904a1de3f8a63d5ab56e73106847fddcf" | 22 | SRCREV = "9dcc803346ab9c999ada37e06e2a508dc61307f5" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 19a372f0..94d59175 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 = "431bd11f304179c77f55edd07d68b02d8408a45c" | 15 | SRCREV = "e1e4d843a0d9b18d29c4c8e45bc3c1e5fcabc863" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 8bf5460c..09f0ef94 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -25,7 +25,7 @@ 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 = "c886d992029740da0185fd2bf8a040c84156e73d" | 28 | SRCREV = "1a2dca888989cd332053d4738e24cd81779cf008" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||