diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2021-03-25 09:17:04 +0200 |
|---|---|---|
| committer | Jani Suonpera <jani.suonpera@qt.io> | 2021-03-25 09:26:44 +0200 |
| commit | 3a6824dfbd06d954d861dace01ecb293cd9098ea (patch) | |
| tree | 7e8711d0f2e16aff2a94d7da8aa6169f19b1ac9e | |
| parent | 594d5549de6ceb401eb971b66bbf7717877c1d6d (diff) | |
| download | meta-qt5-3a6824dfbd06d954d861dace01ecb293cd9098ea.tar.gz | |
qt5: update submodules for LTS 5.15.4
Task-number: QTBUG-91987
Change-Id: I6068c0b1f675c181b47268593e293f2447ad54b8
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/qtbase-native_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_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/qttools_git.bb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index c34002ed..e95bcb5c 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 = "28c303433cac3a9bc90197f599c7c322c2717089" | 198 | SRCREV = "dde0c0a45c3a2b2835b5ae165dc8c04d8e1dd604" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 0e7ac9ea..2856accc 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 = "28c303433cac3a9bc90197f599c7c322c2717089" | 145 | SRCREV = "dde0c0a45c3a2b2835b5ae165dc8c04d8e1dd604" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 16dd3307..7ffa6354 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -302,4 +302,4 @@ sed -i \ | |||
| 302 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 302 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
| 303 | } | 303 | } |
| 304 | 304 | ||
| 305 | SRCREV = "28c303433cac3a9bc90197f599c7c322c2717089" | 305 | SRCREV = "dde0c0a45c3a2b2835b5ae165dc8c04d8e1dd604" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 85067b6a..58529c21 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 = "fbda5f09c7317de47e83fa2d643d6babe10a06db" | 22 | SRCREV = "1b07519f6ca912c0c6334b96d26c61fd8b216a6e" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index f37ef495..43896674 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { | |||
| 32 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 32 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | SRCREV = "6971b1a252497b65c181d02ffac468e73997a9bb" | 35 | SRCREV = "c2b72da5764adfabc446ce339cb173c03af2fc0d" |
| 36 | 36 | ||
| 37 | BBCLASSEXTEND =+ "native nativesdk" | 37 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index d98406f6..7ae125e1 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
| 39 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 39 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
| 40 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ | 40 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ |
| 41 | " | 41 | " |
| 42 | SRCREV = "c49704dd7cded03cc9355c86bd3c2fcf9eeaf64e" | 42 | SRCREV = "64651d862af266f0c39b60eec44e21aa52668f92" |
| 43 | 43 | ||
| 44 | BBCLASSEXTEND = "native nativesdk" | 44 | BBCLASSEXTEND = "native nativesdk" |
| 45 | 45 | ||
