diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-04 10:22:24 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-11 04:49:27 +0000 |
commit | 282f531e63961300be055665acc454356de889fa (patch) | |
tree | b489b56eb7ebc95ce87685911b8676d9f1d59638 | |
parent | 7fe6320da2cb4abec0512ca57e4177ca8de897d6 (diff) | |
download | meta-qt5-282f531e63961300be055665acc454356de889fa.tar.gz |
qt5: update submodulesv5.13.0-alpha
Update to 5.13.0 Alpha
Task-number: QTBUG-72311
Change-Id: I50ce9d42088d4171fd04b340b4cf297b07400445
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
39 files changed, 40 insertions, 75 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 842be2cd..bca866c7 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -42,7 +42,6 @@ SRC_URI += "\ | |||
42 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 42 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
43 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ | 43 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ |
44 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 44 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
45 | file://0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch \ | ||
46 | " | 45 | " |
47 | 46 | ||
48 | # common for qtbase-native and nativesdk-qtbase | 47 | # common for qtbase-native and nativesdk-qtbase |
@@ -194,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { | |||
194 | do_generate_qt_environment_file[umask] = "022" | 193 | do_generate_qt_environment_file[umask] = "022" |
195 | addtask generate_qt_environment_file after do_install before do_package | 194 | addtask generate_qt_environment_file after do_install before do_package |
196 | 195 | ||
197 | SRCREV = "8c47c2a08ec69fe45a14f6c2334befcb2e074790" | 196 | SRCREV = "c1f4286a5cbc1794fe7be5bdbbd6a0bf29ef84d4" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 9c1d86ad..9d2acd99 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 = "b0e11393968ceaad8c35e7df528c73a5e6111f32" | 39 | SRCREV = "bf40a6cbf6b0045c157431f2717697c37bd20697" |
40 | 40 | ||
41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 5b11b8ea..aae297a7 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -37,7 +37,6 @@ SRC_URI += "\ | |||
37 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 37 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
38 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ | 38 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ |
39 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 39 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
40 | file://0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch \ | ||
41 | " | 40 | " |
42 | 41 | ||
43 | # common for qtbase-native and nativesdk-qtbase | 42 | # common for qtbase-native and nativesdk-qtbase |
@@ -140,4 +139,4 @@ do_install() { | |||
140 | 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 |
141 | } | 140 | } |
142 | 141 | ||
143 | SRCREV = "8c47c2a08ec69fe45a14f6c2334befcb2e074790" | 142 | SRCREV = "c1f4286a5cbc1794fe7be5bdbbd6a0bf29ef84d4" |
diff --git a/recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch b/recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch deleted file mode 100644 index a66145c4..00000000 --- a/recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From d26359039f488f1569a581f3e266b1ff236600fc Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Mon, 7 Jan 2019 10:29:53 +0200 | ||
4 | Subject: [PATCH] qmake: use default libdirs to search for prl libs | ||
5 | |||
6 | Default libdirs are never added to the modules' LIBS and if | ||
7 | Qt was configured to use one of the default libdirs, module | ||
8 | might end up without any path to search for its prl files. | ||
9 | |||
10 | Add default libdirs to the search path similar as it's done | ||
11 | in unix/makefile generator. | ||
12 | |||
13 | Fixes: QTBUG-72855 | ||
14 | Change-Id: I43c5bae0d54ba9427ab0ad3eab61ba0c4e2cbde8 | ||
15 | Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> | ||
16 | --- | ||
17 | qmake/generators/win32/winmakefile.cpp | 2 ++ | ||
18 | 1 file changed, 2 insertions(+) | ||
19 | |||
20 | diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp | ||
21 | index 6e4b9a1eb5..a855fcd0a5 100644 | ||
22 | --- a/qmake/generators/win32/winmakefile.cpp | ||
23 | +++ b/qmake/generators/win32/winmakefile.cpp | ||
24 | @@ -84,6 +84,8 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) | ||
25 | if (impexts.isEmpty()) | ||
26 | impexts = project->values("QMAKE_EXTENSION_STATICLIB"); | ||
27 | QList<QMakeLocalFileName> dirs; | ||
28 | + for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) | ||
29 | + dirs.append(QMakeLocalFileName(dlib.toQString())); | ||
30 | static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE", | ||
31 | "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr }; | ||
32 | for (int i = 0; lflags[i]; i++) { | ||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 868dc0fc..b9cb7184 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -33,7 +33,6 @@ SRC_URI += "\ | |||
33 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 33 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
34 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ | 34 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ |
35 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 35 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
36 | file://0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch \ | ||
37 | " | 36 | " |
38 | 37 | ||
39 | # for syncqt | 38 | # for syncqt |
@@ -254,4 +253,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
254 | 253 | ||
255 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 254 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
256 | 255 | ||
257 | SRCREV = "8c47c2a08ec69fe45a14f6c2334befcb2e074790" | 256 | SRCREV = "c1f4286a5cbc1794fe7be5bdbbd6a0bf29ef84d4" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 45c419b9..462a1a88 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 = "d63f5bd20034812b7661d6f2beb7f0025333953d" | 11 | SRCREV = "c01b60a4882f256eea58ffc87d3aac9ce146f98d" |
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 3dfe31d0..8a96d821 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,${BLUEZ}" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "18b57342a009b310c280feeaec3d7cf9f6b98dcb" | 22 | SRCREV = "005cef90c6e06ef419dcec8f4619402677470301" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 5d7bdc32..2d6965f6 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 = "4a86aa5243c7f0bde37fe6094ecb4bc7a9da1721" | 11 | SRCREV = "7d7038d47a72cd203785080e997458f0d44f5e15" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index fb4f3354..5192649a 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 = "f3919f5d94510cc049a438ba2267f9db4a252970" | 27 | SRCREV = "e04e5db13d2a1d03e4afe139fcc29e0ed5b1edab" |
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 f850fb90..5fa6f382 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 = "1d664811805984e58cc44d4553c700d51389c389" | 17 | SRCREV = "419bc7bc6e469ac88522ee9dabcf36ac1c66280c" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 0e127346..6ff96dfd 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 = "29e31fad480e097d7cca121c44fc16028ac3ffa9" | 21 | SRCREV = "0fc226b32789adee140951c63739da65a081d211" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 4f2cfb92..06600e08 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 = "750f359fd7aa47775abefce2d2aa8ec423745622" | 28 | SRCREV = "5904479f50ccafc9556475b4e039d707eadc58b7" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 5e16aebd..8777cc23 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 = "19f55ce3b41e99df2dfc87934143e835c5183d82" | 12 | SRCREV = "8b1f48f3136e65b7d9f29981d8af8f4956a4fd5f" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index f7cafdb8..7bc2dc7b 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 = "d73f9d59e352b096af242ebe69c645def30f5672" | 34 | SRCREV_qtlocation = "ad7bcebc575922fc7c5654c118794e5758d347d2" |
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/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index c0b522b1..ee3d8095 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 = "c6b54f189d280163d4cfb2ab0d7184f387765125" | 12 | SRCREV = "90504201a6c62d24dd48749a0be106dff7e686d0" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 0606e3d5..6257b2ae 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 = "e2275ade82540561ca026325ff945fdfa90f13fe" | 40 | SRCREV = "26830d435d942ce580dfe17209563c47eb3da722" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index ff29bc44..c03b0b13 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 = "8b881885c10d60c636fd777d973e60a75ab9a802" | 12 | SRCREV = "a0d040060f6ff1a4db87498afdcf85ce46de0d81" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 3dd61598..41a278ca 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 = "dc603eef3149cc27482e4bd1b42f299c56bee1da" | 13 | SRCREV = "5e8d47972cc3cf6e89d87a443b5da863397f6784" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index a307d4e2..c0d325be 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 = "f1812309c36ce1e2a7c6b59381424b803cf37068" | 13 | SRCREV = "4c45534f40d963142ee4ac957679776b72c098b0" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index c63d3587..a6d5c301 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 = "efa04c2ae8427c70848477ace3d8f6e82baaab11" | 13 | SRCREV = "3afec43b69991753416380d88e22b5382b8b0832" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index a39a0cae..fb4225f6 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 = "4f28f1c27ae17146348ae3b262f8f0036dd70c62" | 20 | SRCREV = "ee36ee7f7352b08da15d4e4875e93256e4cdc245" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index e6f2f8df..b14d2f9d 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 = "00b89659758ab852a5a6fc18d3f211055f760212" | 27 | SRCREV = "2a14e88f548fbc20537ed9a2736c2e058a1d59af" |
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 70d2d309..78090b70 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 = "3cc9fe5db038ee465f97603f94cbbb64979d8c0b" | 39 | SRCREV = "da2f08af67916ce09daf6dea185a118e0f8bcd6b" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 2beaee82..c7d70130 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 = "7545237546f620d09d37f30cb74d18083b868e54" | 13 | SRCREV = "2d83e09f9d6ca4d604571d7989a359381e6c93ff" |
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 93c59517..a38dc403 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 = "37233436a5d01405dc93ebcfc90cb1a77ce206c1" | 15 | SRCREV = "1579f19830443484c4c51d6924a5b141b4e816e4" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 3bfaa11b..5b75ae01 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 = "a4cf47ddfbfde719429ecd1c06bbb4b948cc9b9d" | 14 | SRCREV = "81a50f7c45cdaa88668a953d40f67d6809b2b16a" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 1d40c168..6e707107 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 = "b9da7701d6f5ee454d138d02b983909e4f6a2077" | 15 | SRCREV = "dc70c4c650b9a0ece63bb8334d1b4e7d7b09818e" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 4e108d40..4e48e73a 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 = "8571c19b95c62dc17a1ade1ecf49c615ea386a26" | 15 | SRCREV = "fbad8e7701708c07bfbae73e6c3158fd9e560ee7" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 2f4c8d56..7dd038bf 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 = "5cb9ce406ee036fc587456281641ee1bb7eadf1f" | 35 | SRCREV = "bf8ee4c99d56c2bf770343b7db07f68a2c6a7617" |
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 7308f7a6..47f92016 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 = "812d36d5f4f7e4858fecd23e18133b21a280dabf" | 101 | SRCREV = "f9b9f4753ca8cd4ef978e61db6125b9fba668c0e" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 836459fb..f7a1dff6 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 = "d72618934d83cb15e4f8116803f02e2e0d4e2cc8" | 52 | SRCREV = "017b7dff8b3e8ebfcd399409b3706afc170124f3" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 0eb74ea8..13e60d7e 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 = "8a638d510db90364cef990e770b84f372bde9f6b" | 40 | SRCREV = "60d6d83ea0c43462d5f8e17aaa654ab6f625dd6e" |
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 4cc7db60..3cb32209 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 = "ba94889c325841c244f401f68267d0450d3ca444" | 15 | SRCREV = "7fa4cf258af693f0fe61e5006ad83a91c63a45df" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index e5bb6b4b..6e50be35 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -132,7 +132,7 @@ RDEPENDS_${PN}-examples += " \ | |||
132 | qtdeclarative-qmlplugins \ | 132 | qtdeclarative-qmlplugins \ |
133 | " | 133 | " |
134 | 134 | ||
135 | QT_MODULE_BRANCH_CHROMIUM = "69-based" | 135 | QT_MODULE_BRANCH_CHROMIUM = "71-based" |
136 | 136 | ||
137 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12 | 137 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12 |
138 | # 5.12.meta-qt5.2 | 138 | # 5.12.meta-qt5.2 |
@@ -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 = "0763b7c40d3490250f5bca1e0029cefba635305c" | 175 | SRCREV_qtwebengine = "60f16cae918adc96e5b01e8599b14a34b97902ef" |
176 | SRCREV_chromium = "323b45aa242e0b4e75689d67418ec124ba1ca815" | 176 | SRCREV_chromium = "8d510183ca27142801b56bb50d63cbb2a92d4337" |
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 fac7f7a8..6f6fea5d 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 = "9a1596059d40789f7909e44705d2323bbeb263fe" | 21 | SRCREV = "d5ed6b5cfd8b8af6c9396a1234df1633aa22dbd8" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index ac6b8b71..60ce95e0 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 = "192a5ec7e93b15c931ac479abf400dc371697ef6" | 14 | SRCREV = "3b925727801483809c963acb7df08dae0f3d0e8a" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index ce1fc81a..a96fd25f 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 = "f2e136c1a16bf2fe3a9ebe392fddd34ad83caede" | 22 | SRCREV = "b9864e03bec6753b0407e8ba784b15bb4394362c" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index db0e8151..e41e0c3a 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 = "3ea03029664273be39c7fb5f72330c1a93387416" | 15 | SRCREV = "e0b62282231888028c520efc5fbc0667b1d9fa2c" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 8e9824f3..c12b0234 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 = "5ca3040606c9dce1a410f1da059a501c03fc2cd9" | 28 | SRCREV = "9010c97bfb341166f963090935a0694a7ac5e929" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||