diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-01 14:54:39 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-03 20:19:38 +0200 |
commit | 39aeb5d1b01f047afa0c8223b889ea045b4c5d94 (patch) | |
tree | 5680d1e7dded6f88e497264b6190baf31502054a | |
parent | 19ceaa67b564c202b612bbf126ce1606d9b94cc0 (diff) | |
download | meta-qt5-39aeb5d1b01f047afa0c8223b889ea045b4c5d94.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.14.0 branch.
Task-number: QTBUG-77876
Change-Id: Iffd2947fa21d29c83c61b7a35aa12b425d035534
-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/qtimageformats_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquick3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 903e86c8..2a50ff38 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 = "11acbc2c9928603dae6b4e2f1ca8b745e766f92b" | 196 | SRCREV = "41226c4c483aaad628cd1ae9733959d2a9389c05" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 1a7365f7..6b72e142 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 = "fee0f43522483415b4af1475caaca21658f3e24a" | 39 | SRCREV = "db9f0721c4406843766aab66d1cae170e76a237d" |
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 f49e937f..5cd51c5d 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 = "11acbc2c9928603dae6b4e2f1ca8b745e766f92b" | 144 | SRCREV = "41226c4c483aaad628cd1ae9733959d2a9389c05" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index e02353c9..52a87759 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 = "11acbc2c9928603dae6b4e2f1ca8b745e766f92b" | 278 | SRCREV = "41226c4c483aaad628cd1ae9733959d2a9389c05" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index d58afb5e..4e4dd095 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 = "ff6cf6764ded8c028f693da70b876a00fbff2a5f" | 28 | SRCREV = "8ca5b34c1aacc4b7a8f20bf9aadd04f1eeafd3f6" |
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index af1d1300..848e870c 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 = "e118912f6e92efb6d21df08da13a22fec4f3ecf9" | 24 | SRCREV_qtquick3d = "e6bdc2917b19bbcd4d31d474958bf72f33330b68" |
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/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index d0ce92d1..a8c9677d 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -40,7 +40,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\ | |||
40 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ | 40 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ |
41 | " | 41 | " |
42 | 42 | ||
43 | SRCREV = "a339e4a1e3b53d852c1e6a445e3159dbd8bc0e80" | 43 | SRCREV = "e75afb9ab5746b97cb2d9f1538f7fd9ec943bb10" |
44 | 44 | ||
45 | BBCLASSEXTEND = "native nativesdk" | 45 | BBCLASSEXTEND = "native nativesdk" |
46 | 46 | ||
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index c4406155..2c232eda 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 = "143fd7c785361a27712e812e70dca788b831d1b3" | 40 | SRCREV = "d4ac2c9915fed87193cd2cf7ac438a9fa8edc126" |
41 | 41 | ||
42 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
43 | 43 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 094516d3..0ef6bf6f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -176,7 +176,7 @@ SRC_URI_append_libc-musl = "\ | |||
176 | file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 176 | file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
177 | " | 177 | " |
178 | 178 | ||
179 | SRCREV_qtwebengine = "196a8061a4f00a6df6b160f6859eaa199e7e2e3c" | 179 | SRCREV_qtwebengine = "21f10e777ee2faf41196d0263d4e5134d0ec216a" |
180 | SRCREV_chromium = "88a931558e2e960eacccb32483713fcc4bbaf433" | 180 | SRCREV_chromium = "88a931558e2e960eacccb32483713fcc4bbaf433" |
181 | SRCREV = "${SRCREV_qtwebengine}" | 181 | SRCREV = "${SRCREV_qtwebengine}" |
182 | 182 | ||