diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-08-16 13:07:54 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-08-19 19:07:41 +0000 |
commit | 7ce1036b58d742315fb9b307ea2396b2adc13ca4 (patch) | |
tree | d27aecce1dc2b61281e0112cceefdead6e417694 | |
parent | f6bae656fa1b8e7ec28ecac5bf0ac70d63abd1b5 (diff) | |
download | meta-qt5-7ce1036b58d742315fb9b307ea2396b2adc13ca4.tar.gz |
qt5: update submodules
Update to latest content on Qt 5.13.1 branch
Task-number: QTBUG-76756
Change-Id: I914897bcc7ba5cb94d300eb77b55d2bd3529cf83
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_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/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtscxml_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 4039c97a..46107140 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 = "4f116f00fcd93decbf6fc01b61b0be7c293d3c39" | 196 | SRCREV = "a9b9a881344239781e5894f2dd3d0af90ffbb4ba" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 8565aa35..9083a89b 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -142,4 +142,4 @@ do_install() { | |||
142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
143 | } | 143 | } |
144 | 144 | ||
145 | SRCREV = "4f116f00fcd93decbf6fc01b61b0be7c293d3c39" | 145 | SRCREV = "a9b9a881344239781e5894f2dd3d0af90ffbb4ba" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3cb613ce..281bae3d 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 = "4f116f00fcd93decbf6fc01b61b0be7c293d3c39" | 278 | SRCREV = "a9b9a881344239781e5894f2dd3d0af90ffbb4ba" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 9b370cda..8f57d322 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 = "7c2ec7dc49799fffb2ed48a3a5afe2d8561ce3ee" | 13 | SRCREV = "230d6f6adc580c853cc05f484e5000703f3e42b0" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 1a10d573..f11911e1 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 = "1323d465b4698296533cf6c73ea5ace65dd0ce94" | 13 | SRCREV = "14b12a05efa4bd20f29ede7b729bfd5e2703358a" |
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/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 3431dd9e..a9c53858 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 = "f4636b934f90b2a07b09f1925a86440cf1944d08" | 40 | SRCREV = "2b1aad5f86fec13bb83043ed1b08f066dd914b3d" |
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 54026cfa..44672178 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -173,7 +173,7 @@ SRC_URI_append_libc-musl = "\ | |||
173 | file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 173 | file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
174 | " | 174 | " |
175 | 175 | ||
176 | SRCREV_qtwebengine = "a6c32599a14e1c4c61f7b9c4968f8d8635f5e29c" | 176 | SRCREV_qtwebengine = "e00041659a938b72e52c575338655264dc97b0bb" |
177 | SRCREV_chromium = "65c74dd3316c12a4457a6fd202f9b4437186898c" | 177 | SRCREV_chromium = "65c74dd3316c12a4457a6fd202f9b4437186898c" |
178 | SRCREV = "${SRCREV_qtwebengine}" | 178 | SRCREV = "${SRCREV_qtwebengine}" |
179 | 179 | ||