diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-05-12 13:40:37 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-05-13 16:35:30 +0300 |
| commit | 710f5bcf4c4ffc4bb32dc0da523e7307909b8f6b (patch) | |
| tree | bc3e6f25a9bc49d8da54fe0ae8d5b3e53114e403 | |
| parent | 999a301f64894a12dc0f0caeb8af240c73c8a332 (diff) | |
| download | meta-qt5-710f5bcf4c4ffc4bb32dc0da523e7307909b8f6b.tar.gz | |
qt5: update submodulesv5.15.0
Update qtbase & qtdeclarative for Qt 5.15.0.
Task-number: QTBUG-80823
Change-Id: I40b019381bba2390a8353c249acf46a5931f3314
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/qtdeclarative_git.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index f38dd2b2..4129681c 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -196,4 +196,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 196 | do_generate_qt_environment_file[umask] = "022" | 196 | do_generate_qt_environment_file[umask] = "022" |
| 197 | addtask generate_qt_environment_file after do_install before do_package | 197 | addtask generate_qt_environment_file after do_install before do_package |
| 198 | 198 | ||
| 199 | SRCREV = "a8b373d678f44a9d7006a412cabc75e7586b2c43" | 199 | SRCREV = "ba3b53cb501a77144aa6259e48a8e0edc3d1481d" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3990436b..2a40a984 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -143,4 +143,4 @@ do_install() { | |||
| 143 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 143 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 144 | } | 144 | } |
| 145 | 145 | ||
| 146 | SRCREV = "a8b373d678f44a9d7006a412cabc75e7586b2c43" | 146 | SRCREV = "ba3b53cb501a77144aa6259e48a8e0edc3d1481d" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3777bae5..baad4d83 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -295,4 +295,4 @@ sed -i \ | |||
| 295 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 295 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
| 296 | } | 296 | } |
| 297 | 297 | ||
| 298 | SRCREV = "a8b373d678f44a9d7006a412cabc75e7586b2c43" | 298 | SRCREV = "ba3b53cb501a77144aa6259e48a8e0edc3d1481d" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 7ae8e9a3..4304e1f6 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -31,6 +31,6 @@ do_install_append_class-nativesdk() { | |||
| 31 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 31 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | SRCREV = "829da623961b9d4e8c3a2236cb9580dec97c2483" | 34 | SRCREV = "5a3d9309ec018445a3471d40366f41ee2f6ebef7" |
| 35 | 35 | ||
| 36 | BBCLASSEXTEND =+ "native nativesdk" | 36 | BBCLASSEXTEND =+ "native nativesdk" |