summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-12-09 09:31:08 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-12-09 12:32:18 +0200
commitca08d8c7b82c98067175b803712cbddec6d451c7 (patch)
tree4c0875d882028bfba888ff6ee626526cc17b6f66
parentf7841daf36c178f08348c0b29955f732e716c6d8 (diff)
downloadmeta-qt5-ca08d8c7b82c98067175b803712cbddec6d451c7.tar.gz
qt5: update submodulesv5.14.0-rc2
Update to latest content in Qt 5.14.0 branch. Task-number: QTBUG-77876 Change-Id: Ied5adf07023c9bd04978f3c17ff999f4e4897a55 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb2
10 files changed, 10 insertions, 10 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 4248f7f8..65e93aa5 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() {
194do_generate_qt_environment_file[umask] = "022" 194do_generate_qt_environment_file[umask] = "022"
195addtask generate_qt_environment_file after do_install before do_package 195addtask generate_qt_environment_file after do_install before do_package
196 196
197SRCREV = "a5cbff60f063d271500e31eba5bd236741d2367b" 197SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 4c645e32..cbdbeae7 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
39SRCREV = "c2c4338185722e02cb55a886c14c04295713609a" 39SRCREV = "96b1b9e3e198e751bb96eeb279106862ca38e7d7"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 6a60149e..94cd4960 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
145SRCREV = "a5cbff60f063d271500e31eba5bd236741d2367b" 145SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 7923caec..cbbb553f 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -277,4 +277,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
277 277
278RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 278RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
279 279
280SRCREV = "a5cbff60f063d271500e31eba5bd236741d2367b" 280SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index a7b66a79..a662beaa 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
31SRCREV = "75c7f093e0b8e321306ae1189b71866a9073df00" 31SRCREV = "290251541e615358dcc7a289ff2adb30f309c132"
32 32
33BBCLASSEXTEND =+ "native nativesdk" 33BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 203a0121..96331422 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/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "e86d96e321caa623ac0f98f44323c2b204cd9861" 40SRCREV = "d9f2a814eb5d8c2c0e985f60b345fefd956e2bb0"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index f191257b..33b7ed3a 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
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "419455bfe6e51601504d7c2fa5a2a9dff9c20851" 28SRCREV = "2f00e14a46292afbf036e196aa72dc2f1639bf50"
29 29
30BBCLASSEXTEND += "native nativesdk" 30BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 8d97af19..955a0f4b 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
43SRCREV = "4df37b4d1fb19ea0df7c293c210ecdbd3337a9b7" 43SRCREV = "1682033b1bdadefeb9b953f7d9d096d884f797e2"
44 44
45BBCLASSEXTEND = "native nativesdk" 45BBCLASSEXTEND = "native nativesdk"
46 46
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 58fe3386..54c4d5d0 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
72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
73 73
74SRCREV = "e34d4ed13c7778a403e4d7c08b84e220deb119af" 74SRCREV = "459ec87b0abdd476d415946ed07c8490c10b97f0"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index cb5e1e55..bf602b8e 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -177,7 +177,7 @@ SRC_URI_append_libc-musl = "\
177 file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 177 file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
178" 178"
179 179
180SRCREV_qtwebengine = "779a4cc9ce5a3c2f62b0b3d68b632df6f2ce90ad" 180SRCREV_qtwebengine = "d366f1d5d37ce6f1833ac67c7ebda540b16690f2"
181SRCREV_chromium = "939daf833fff3a9901afb6fd65d02e0f057a494a" 181SRCREV_chromium = "939daf833fff3a9901afb6fd65d02e0f057a494a"
182SRCREV = "${SRCREV_qtwebengine}" 182SRCREV = "${SRCREV_qtwebengine}"
183 183