diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-07-31 13:33:09 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-05 07:26:53 +0000 |
commit | 1716c294770b10e41af1b11cbe820ca857168556 (patch) | |
tree | 4d757023dab74a100a31eb14ccd686a9999f8c62 | |
parent | 584d86653c658afa3e16bff095101ed11cf61d31 (diff) | |
download | meta-qt5-1716c294770b10e41af1b11cbe820ca857168556.tar.gz |
qt5: update to Qt 5.13.1
Change-Id: I1581770fa88763654b62bd7054c889852138ef65
Reviewed-by: Kari Hormi <kari.hormi@qt.io>
40 files changed, 83 insertions, 45 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index ae1cc441..739c12bf 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 = "fc9ae22c88dd085c7c31599037132fc756feeb04" | 196 | SRCREV = "28af6e97e5fe7f844bc85df7af22ce8b7414f5a6" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 25681f53..c470e90d 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 = "7640c5d526d10e0397e9f2e712139433165d269f" | 39 | SRCREV = "7e60b6d599db9d4b18db3fe050d9f53ccb3125c1" |
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 492b1350..a2c3691c 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.13.0+git${SRCPV}" | 17 | PV = "5.13.1+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 663924dc..d917595a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -141,4 +141,4 @@ do_install() { | |||
141 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 141 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
142 | } | 142 | } |
143 | 143 | ||
144 | SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" | 144 | SRCREV = "28af6e97e5fe7f844bc85df7af22ce8b7414f5a6" |
diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch index e275a80e..e0591d2a 100644 --- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ffd62d10df5607897ef366330e368069fed1a9b9 Mon Sep 17 00:00:00 2001 | 1 | From a080cb3ac2ad24aeb73407c772ed560dc4cb7ef5 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Tue, 23 Oct 2018 09:54:57 +0300 | 3 | Date: Tue, 23 Oct 2018 09:54:57 +0300 |
4 | Subject: [PATCH] Disable ltcg for host_build | 4 | Subject: [PATCH] Disable ltcg for host_build |
@@ -15,12 +15,14 @@ Upstream-Status: Inappropriate [embedded specific] | |||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf | 17 | diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf |
18 | index ccf0226272..482e5b573d 100644 | 18 | index a94f6d0eeb..3cb01c334d 100644 |
19 | --- a/mkspecs/features/ltcg.prf | 19 | --- a/mkspecs/features/ltcg.prf |
20 | +++ b/mkspecs/features/ltcg.prf | 20 | +++ b/mkspecs/features/ltcg.prf |
21 | @@ -1,4 +1,4 @@ | 21 | @@ -1,6 +1,6 @@ |
22 | -CONFIG(release, debug|release) { | 22 | static:no-static-ltcg { |
23 | +CONFIG(release, debug|release):!host_build { | 23 | # Static library but no-static-ltcg enabled: skip LTCG |
24 | -} else: CONFIG(release, debug|release) { | ||
25 | +} else: CONFIG(release, debug|release):!host_build { | ||
24 | # We need fat object files when creating static libraries on some platforms | 26 | # We need fat object files when creating static libraries on some platforms |
25 | # so the linker will know to load a particular object from the library | 27 | # so the linker will know to load a particular object from the library |
26 | # in the first place. On others, we have special ar and nm to create the symbol | 28 | # in the first place. On others, we have special ar and nm to create the symbol |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 077cc651..5e4a89b2 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
275 | 275 | ||
276 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 276 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
277 | 277 | ||
278 | SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" | 278 | SRCREV = "28af6e97e5fe7f844bc85df7af22ce8b7414f5a6" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index b289914b..23c2d008 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 = "7c50ad366e8e40996a3b75a31b9834f6f667bde6" | 11 | SRCREV = "aa765c1b7802746e6a97043b62a142eb2d2137af" |
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/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 5379d09f..3174aaf7 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 = "8f2d6640f959e35a8fd033a50aa57cb13b673cbb" | 24 | SRCREV = "96dd4e7ff0b10ac79798f1ae63db716bcc199e87" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 78de05b3..0165fc15 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 = "cc7f4769a02421575c9f5a61d9b3687af79201dd" | 11 | SRCREV = "3206729aa704d9c7cdfaa734f177334d5c11ae72" |
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch b/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch new file mode 100644 index 00000000..d2bac1f7 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 5ae643e2ab69892e0dbe296cf14e020c7938ebee Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?J=C3=B6rg=20Bornemann?= <joerg.bornemann@qt.io> | ||
3 | Date: Fri, 2 Aug 2019 11:03:06 +0000 | ||
4 | Subject: [PATCH] Revert "Yield error if qtquickcompiler is used in non-QML | ||
5 | projects" | ||
6 | |||
7 | This reverts commit c5578b16d6454e708c8ce12661a85d41eeaaa758, because | ||
8 | it prevents enabling the qtquickcompiler feature globally. | ||
9 | |||
10 | Fixes: QTBUG-77277 | ||
11 | Change-Id: Ic80835c462570a67ae3105bb3d1b6452800d2c94 | ||
12 | Reviewed-by: Kai Koehne <kai.koehne@qt.io> | ||
13 | --- | ||
14 | tools/qmlcachegen/qtquickcompiler.prf | 10 ---------- | ||
15 | 1 file changed, 10 deletions(-) | ||
16 | |||
17 | diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf | ||
18 | index 967d55a5b..b98d8a019 100644 | ||
19 | --- a/tools/qmlcachegen/qtquickcompiler.prf | ||
20 | +++ b/tools/qmlcachegen/qtquickcompiler.prf | ||
21 | @@ -1,15 +1,5 @@ | ||
22 | if(qtc_run|lupdate_run): return() | ||
23 | |||
24 | -!contains(QT, qml) { | ||
25 | - qt_modules = \ | ||
26 | - $$replace(QT, -private$, _private) \ | ||
27 | - $$replace(QT_PRIVATE, -private$, _private) | ||
28 | - qt_modules = $$resolve_depends(qt_modules, "QT.", ".depends" ".run_depends") | ||
29 | - !contains(qt_modules, qml): \ | ||
30 | - error("The qtquickcompiler feature cannot be used without the QML module.") | ||
31 | - unset(qt_modules) | ||
32 | -} | ||
33 | - | ||
34 | qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER) | ||
35 | qtPrepareTool(QMAKE_RCC, rcc, _DEP) | ||
36 | |||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 9d06377d..63146214 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS += "qtbase" | 15 | DEPENDS += "qtbase" |
16 | 16 | ||
17 | SRC_URI += "file://0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch" | ||
18 | |||
17 | PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" | 19 | PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" |
18 | PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" | 20 | PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" |
19 | PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" | 21 | PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" |
@@ -24,6 +26,6 @@ do_install_append_class-nativesdk() { | |||
24 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 26 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
25 | } | 27 | } |
26 | 28 | ||
27 | SRCREV = "ecc092fa5519e77a47ef560f0137b4cd5f417c5e" | 29 | SRCREV = "aeec2f94c376c9a0e84bbbb3be4652384c7da113" |
28 | 30 | ||
29 | BBCLASSEXTEND =+ "native nativesdk" | 31 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index a130c86e..53381547 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 = "7d610c6b1a437235cba38848c1af9afd5556dc73" | 17 | SRCREV = "027a1dfd3eca382dab3f3f17e7f43ccb84e329be" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 973a2b7a..32c1dc20 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 = "417dff666bd5a9e5a09b67780b0ffa8a496cbe92" | 21 | SRCREV = "3b3b3f85ddd472bdae168f210e62dc2868997aae" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index d1905873..e5154951 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 = "a743e1427b4ce9b4f1c43d3456679c09cee7b4e0" | 28 | SRCREV = "adc70a5244a8a7c3d554cbcfc3f38f8396974900" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index eae03ae1..62c76b06 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 = "667af08a388ffc3441adc5b8e73f2f8797b274c5" | 34 | SRCREV_qtlocation = "46ae4e4db687b8a12e639d9b248546652b680c04" |
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..9291d472 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 = "4c3207a7385a3ba402884bb50136bbe7b70baa2e" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index b24f2a4c..471b8df7 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 = "f5c4fdd1f57bfbcb0a286ca10de5f6d5d0e47047" | 40 | SRCREV = "dbdcc1b099dc25ffb707a2441191463de33c51f3" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index a63a29e8..437b6ee9 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 = "8bc01cbfe15843ab0ea6e9b9731c4eab83dec1ab" | 12 | SRCREV = "c2bf9b420f29e4b001d6f85b918be5fb89c87564" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 846e6eda..db098761 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 = "d7b00a49803412caf6a0b415974ff2f4c3adf7f7" | 13 | SRCREV = "a0f911a29eb055de1e9dc2d3e78a1f03ccead5da" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 73f9c3d7..bdb93602 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 = "ea80013b2e990c8c28a9dfe7d6afaaa250bf2402" | 13 | SRCREV = "200b47519ffc61ebd06cda9a4c452d7b15e37d33" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index a5228fbd..ec3e7991 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 = "5f7e823d67e615727c8e36aafc6baadfc105c67f" | 20 | SRCREV = "845cd17a498d6008992b04ec4ca1984e6e73de3c" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 5e6d6bdc..c7cf976c 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 = "e7b07a60408285128dedb373316801294ca941b0" | 27 | SRCREV = "6ccba37dedcb37507fd1ab3c72e576c0b005e572" |
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 4789cade..259f32e0 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 = "9401306e2db3a1756aab958d0939d12c8d5f46e0" | 39 | SRCREV = "912346548c774cdcc4383cc30e06f106dbf77a97" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 1b0e51e7..1a10d573 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 = "cb8388ac1de37ff31786cd1bd4723938b76d0f0a" | 13 | SRCREV = "1323d465b4698296533cf6c73ea5ace65dd0ce94" |
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.2 | 16 | # 5.12.meta-qt5.2 |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index aad757cc..5f16351f 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 = "ce508999540cb125dad40dd250b17e6ad20d542b" | 15 | SRCREV = "6390e165dc2df3bc48c3655ed45d1b952d1f2bae" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 1d48f5b0..b8be30bb 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 = "b18c452fdbe09c54caacb4323dea65b3746485e5" | 14 | SRCREV = "5d82bf36c526d55951127c95d8c0aa5abc2e199d" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 648460db..9032d23e 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 = "2f2b747ebc4dd982caede82a0a931ad73e4cd462" | 15 | SRCREV = "335f1d02dc134bf11277c0573553c7c838cc6a9f" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index e7d8872d..3a42b366 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 = "3a4c634241f7271ddfbb840a42d6bf863b46ccea" | 15 | SRCREV = "1bdd9b7bbc6d2ca83095c2f9a376ef6867674ca8" |
diff --git a/recipes-qt/qt5/qttools/run-ptest b/recipes-qt/qt5/qttools/run-ptest index 5cd5e27e..ae671a72 100644 --- a/recipes-qt/qt5/qttools/run-ptest +++ b/recipes-qt/qt5/qttools/run-ptest | |||
@@ -1,4 +1,3 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | ./tst_qtdiag | 3 | ./tst_qtdiag |
4 | ./tst_qtattributionsscanner | ||
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index e33d17d2..38256a7f 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 = "cc9250477eaa71a3f3ffd050591d4a9d835288ca" | 35 | SRCREV = "6d19911c0db508a1c0079890a0adc8f6ab87bcf7" |
36 | 36 | ||
37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
38 | 38 | ||
@@ -40,5 +40,4 @@ do_install_ptest() { | |||
40 | mkdir -p ${D}${PTEST_PATH} | 40 | mkdir -p ${D}${PTEST_PATH} |
41 | t=${D}${PTEST_PATH} | 41 | t=${D}${PTEST_PATH} |
42 | cp ${B}/tests/auto/qtdiag/tst_tdiag $t | 42 | cp ${B}/tests/auto/qtdiag/tst_tdiag $t |
43 | cp ${B}/tests/auto/qtattributionsscanner/tst_qtattributionsscanner $t | ||
44 | } | 43 | } |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index bbaee2ef..6f6fd291 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 = "88266670663256f40019e7163092e17401557d5f" | 101 | SRCREV = "55b11294296a7bbc3a3bdfe9d2f5b381abf01d92" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 21ca0590..b8026230 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 = "2413bc23c5f9995752fdd03d56e480d661fc6fbc" | 52 | SRCREV = "6143eec2525af08e6aab895bcf64c2745a427f13" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index cfcfad8e..3431dd9e 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 = "79037e46eeb00e20c5f3bbe7d0de4b702af86884" | 40 | SRCREV = "f4636b934f90b2a07b09f1925a86440cf1944d08" |
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 b468ecb1..846f0507 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 = "fdba7f6e285d35757190d99f9880e3bd0380e254" | 15 | SRCREV = "c5d4f9b1a653a242b6231cbdea8ccfc751180beb" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index a281cba2..8447e926 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -172,8 +172,8 @@ SRC_URI_append_libc-musl = "\ | |||
172 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 172 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
173 | " | 173 | " |
174 | 174 | ||
175 | SRCREV_qtwebengine = "5d4bac57a0191287a2fc345f6b398fb1f5d08517" | 175 | SRCREV_qtwebengine = "fa555f40bca60e82194bef22915bf7c545082c0e" |
176 | SRCREV_chromium = "8a28c0bb19fc8627812cb7c3154408b71ff2bf5e" | 176 | SRCREV_chromium = "8096caad7098cb949899abb6a231d28349c7e409" |
177 | SRCREV = "${SRCREV_qtwebengine}" | 177 | SRCREV = "${SRCREV_qtwebengine}" |
178 | 178 | ||
179 | SRCREV_FORMAT = "qtwebengine_chromium" | 179 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index b5760229..239060ac 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 = "15637e6d824bca5d149147207a98cbc016fbbef6" | 21 | SRCREV = "95957bbecc40e5efb163ab123c2a7d8d04005bef" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 11144537..55b165f9 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 = "b7d892b97697f90b3669dab56358a48fb3542f68" | 14 | SRCREV = "0634c8104558dbb7acd314d52cf4b039c8c3689d" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index dc2a3e4b..ea219ac1 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 = "3265fa961a27894faa5b3413fb39c8682266a72f" | 22 | SRCREV = "5c80bba07d09f498027586a32b0f937d26cca1dd" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 31c5b671..c0bb2e3f 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 = "7e86e23ee87f2450b3f7103632c3ad2ab082e5eb" | 15 | SRCREV = "d6090610969cd7f2f5554e6239b0e35f8755196a" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 73631fcd..5bf1c6ce 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 = "29891df4ce099542635e33891945ba19f3e9572c" | 28 | SRCREV = "84e44bf5a9e5dcb0f93c55129f565e34edb7dd1a" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||