diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-16 09:43:46 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-17 09:11:46 +0200 |
| commit | 2adb0d385cf93f54217ffb00e6dab904b5c5d0d6 (patch) | |
| tree | db3cf045da94c286b0519b43642b0dd3c877f1a7 | |
| parent | a1926f5f109d04e0d10ec207e04ca5abab06f4df (diff) | |
| download | meta-qt5-2adb0d385cf93f54217ffb00e6dab904b5c5d0d6.tar.gz | |
qt5: update submodules
Update to latest content in Qt 5.12 branch.
Task-number: QTBUG-82321
Change-Id: I727853b81c58cbc748fea5dc9b9a80b32658ba72
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/qtcanvas3d_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtconnectivity_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/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 fa052208..405c877f 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() { | |||
| 194 | do_generate_qt_environment_file[umask] = "022" | 194 | do_generate_qt_environment_file[umask] = "022" |
| 195 | addtask generate_qt_environment_file after do_install before do_package | 195 | addtask generate_qt_environment_file after do_install before do_package |
| 196 | 196 | ||
| 197 | SRCREV = "66e06b296357c12f037762ce50092dd230873e32" | 197 | SRCREV = "e9ae7cf31ff304150692d470ef914ec4d08c818e" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 3735fe28..1cf16306 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 = "b164cb09d4221c3b3655755f758b333ea76cce2b" | 39 | SRCREV = "292481b0c0f87e43579acd6d26c6bc9e1a399a93" |
| 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 58f49bc6..f94d6693 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 = "66e06b296357c12f037762ce50092dd230873e32" | 145 | SRCREV = "e9ae7cf31ff304150692d470ef914ec4d08c818e" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index aa11340a..6e5350b4 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -276,4 +276,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 276 | 276 | ||
| 277 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 277 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 278 | 278 | ||
| 279 | SRCREV = "66e06b296357c12f037762ce50092dd230873e32" | 279 | SRCREV = "e9ae7cf31ff304150692d470ef914ec4d08c818e" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 3a9ef3ed..048d01b3 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
| @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | 11 | ||
| 12 | DEPENDS = "qtdeclarative" | 12 | DEPENDS = "qtdeclarative" |
| 13 | 13 | ||
| 14 | SRCREV = "53cfcae6e9c6e31358857b06baaa31237e15fc3b" | 14 | SRCREV = "abab2cc31b49d78d40cd52d4ac3bf32510390522" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index a56e4aae..bb768c46 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,bluez5" | |||
| 19 | 19 | ||
| 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 21 | 21 | ||
| 22 | SRCREV = "5f6187cb9e17b55cd2a68ac3094ae6a1879b50a2" | 22 | SRCREV = "b4282fd32ea06c1d634ea322f682a4c939a0cc89" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 4a3f5af8..da11b861 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 = "e9b4fac4e1765ea8789b17948a0a22fad7db50c0" | 27 | SRCREV = "cbd4456c9db70afda6c8408be7e5da800889d169" |
| 28 | 28 | ||
| 29 | BBCLASSEXTEND =+ "native nativesdk" | 29 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 3e300a9c..b6df5028 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 = "884b676bba3b1bae9cee982e8b387b067ea02b24" | 28 | SRCREV = "6e7fe099f41068aa75fe01e52f1496dfdc12ed79" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 5b62602d..f09c7620 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/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 176 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
| 177 | " | 177 | " |
| 178 | 178 | ||
| 179 | SRCREV_qtwebengine = "578f432c4d6517ab1d8fff8b8b08a47135910b41" | 179 | SRCREV_qtwebengine = "d7a7663c58fa81b04b2acc63c3e672fce2f46116" |
| 180 | SRCREV_chromium = "5ca6ac0f951adec1f816b42f1c862d699e56a645" | 180 | SRCREV_chromium = "5ca6ac0f951adec1f816b42f1c862d699e56a645" |
| 181 | SRCREV = "${SRCREV_qtwebengine}" | 181 | SRCREV = "${SRCREV_qtwebengine}" |
| 182 | 182 | ||
