diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-20 10:17:30 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-21 10:17:55 +0200 |
commit | d708503f0ca12e25d0a669ae2d57a702ae7916b8 (patch) | |
tree | 375bd4d53f690f7cb9b1ac61ada30f29d427c726 | |
parent | 09821bcf8a979830e2a4b581829978d0e42230a4 (diff) | |
download | meta-qt5-d708503f0ca12e25d0a669ae2d57a702ae7916b8.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.14.1 branch.
Task-number: QTBUG-80778
Change-Id: Id13e4f586b4ca6ac74e3db6cf1ed79c0620998e3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtcoap_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtimageformats_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtopcua_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquick3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtsvg_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebglplugin_git.bb | 2 |
19 files changed, 20 insertions, 20 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index e907abe7..80f5ad21 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() { | |||
195 | do_generate_qt_environment_file[umask] = "022" | 195 | do_generate_qt_environment_file[umask] = "022" |
196 | addtask generate_qt_environment_file after do_install before do_package | 196 | addtask generate_qt_environment_file after do_install before do_package |
197 | 197 | ||
198 | SRCREV = "06a7da3c3d9654748e21efff72db6f85c319ea43" | 198 | SRCREV = "4f55c4181682538e6b1ac2609d907889ca14a02e" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 9f558ee6..68e311ec 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 = "532e108a3abf56aa0ef709af5049ce3b2161ed84" | 39 | SRCREV = "5aedae5aa9251e1216d7bc1652cb1f451dd047c1" |
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 0d5da975..88dd6ade 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -143,4 +143,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 | 143 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
144 | } | 144 | } |
145 | 145 | ||
146 | SRCREV = "06a7da3c3d9654748e21efff72db6f85c319ea43" | 146 | SRCREV = "4f55c4181682538e6b1ac2609d907889ca14a02e" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 00d2e9c4..f5f51c60 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -296,4 +296,4 @@ sed -i \ | |||
296 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 296 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
297 | } | 297 | } |
298 | 298 | ||
299 | SRCREV = "06a7da3c3d9654748e21efff72db6f85c319ea43" | 299 | SRCREV = "4f55c4181682538e6b1ac2609d907889ca14a02e" |
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index bf14f1ca..1b1f5296 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 = "e04fdb6d20ad06141f14bd18e7f1a13c941be35e" | 14 | SRCREV = "7dc2630196197363f1861e23bb8eef6f53074eff" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 897b633e..e32ff848 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -28,6 +28,6 @@ do_install_append_class-nativesdk() { | |||
28 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 28 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
29 | } | 29 | } |
30 | 30 | ||
31 | SRCREV = "3a06d02197179240b8ea589534dc3416c75fc0f2" | 31 | SRCREV = "51a158929b55dffbdfb757da8bd6a2cd181906c6" |
32 | 32 | ||
33 | BBCLASSEXTEND =+ "native nativesdk" | 33 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 6e6b2e69..b29af0b4 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 = "31338f220f1ad1d0b8c050c48b04e733c4b62e1b" | 28 | SRCREV = "caca9d8d2bd89facaf9a694d9236d061b8c53b6c" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index b37c3309..f90cdba4 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 = "a8f83d4a3ebbe106a84183178b715bdff24768b3" | 40 | SRCREV = "2091eac697ff6f7be03203d3180633a417c8c58c" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 08741090..ab715927 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 = "be20be932e51d103b3ae6270f8921e62e65bd3a1" | 21 | SRCREV = "4a9653f36d528e30989ea4e00a15a6d06a19001f" |
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 4a8f08f3..b21e9384 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 = "55d74bbb15b757d22692a96b256d0ebd8f6025af" | 24 | SRCREV_qtquick3d = "13f56e59c7d019e9787da583a640403f33c8fe9a" |
25 | SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" | 25 | SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" |
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 23751a16..1ec80555 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 = "090eab86b05478572485b3086c087a846fbae7fd" | 13 | SRCREV = "f4d5939ad613fda69aa750139ef929fac18b97ae" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 293256ff..6d1931a2 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 = "a7beb6fca24ca639f2b8c128c15170d46116fd1e" | 20 | SRCREV = "c8a2a74b2839d9d6c5f8f6f9034470dafc8bcc40" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index d495d498..13c37e98 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 = "48a059f89e5214195802f02913005def43dfb10d" | 28 | SRCREV = "0cb1384479a2ebcbc72a3941462fb3e67aaa884d" |
29 | 29 | ||
30 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index b5ebe9bc..9bdbaa77 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 = "acb66cad2280bda20d26d08d606a66b9660b17aa" | 15 | SRCREV = "bbe8f65cd070ab85a5e7cd31548e5fef3f7f53e3" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 99ed17dc..f98c9371 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 = "f9db2b99b2de6ba1442c7acc0888cc2129b8b903" | 52 | SRCREV = "a3430755811a998fbd49baae4b3782aebe3583c9" |
53 | 53 | ||
54 | BBCLASSEXTEND = "native nativesdk" | 54 | BBCLASSEXTEND = "native nativesdk" |
55 | 55 | ||
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 60b527f7..3a76fc27 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 = "aac99aa2cd204c0e285dc5f1c1aebf4c1ee19a7a" | 74 | SRCREV = "e73bd4875d5a07d5357bbcb46d581dd32b3821de" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 8ae23f70..7b7dd69c 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -39,7 +39,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris | |||
39 | 39 | ||
40 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 40 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
41 | 41 | ||
42 | SRCREV = "5c5532bbac106d02359aaf6230c0c73fec8dbb7e" | 42 | SRCREV = "c2f216ef211ae8fbe0073c296742f584f5493e9f" |
43 | 43 | ||
44 | BBCLASSEXTEND =+ "native nativesdk" | 44 | BBCLASSEXTEND =+ "native nativesdk" |
45 | 45 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 56d48f97..0cf1bd12 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -180,8 +180,8 @@ SRC_URI_append_libc-musl = "\ | |||
180 | file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 180 | file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
181 | " | 181 | " |
182 | 182 | ||
183 | SRCREV_qtwebengine = "d2f6a5c7b97d61c4e983243d444dd51592a44bab" | 183 | SRCREV_qtwebengine = "7876f261b38361dddce2a7526f2504197f4f8b46" |
184 | SRCREV_chromium = "dc1226a13d95ff24fb31d0d2278dd6cd8c9d1d12" | 184 | SRCREV_chromium = "3299cadf4068b0d6466b699a5ea3ac3bd622dc9a" |
185 | SRCREV = "${SRCREV_qtwebengine}" | 185 | SRCREV = "${SRCREV_qtwebengine}" |
186 | 186 | ||
187 | SRCREV_FORMAT = "qtwebengine_chromium" | 187 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index ec10e83e..ebc9db7a 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 = "11324948c1a68233d08726c13571d394b85f4d13" | 21 | SRCREV = "8476f66f413e89a4eb60f395a6e3840e0fe61a5f" |