diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-12-02 08:48:09 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-12-03 08:51:31 +0200 |
| commit | f7841daf36c178f08348c0b29955f732e716c6d8 (patch) | |
| tree | fc9470a2a23b525bf63bad4c15d38821ae20c9f9 /recipes-qt/qt5/qtbase-native_git.bb | |
| parent | 280139a9d5a7025020de661b2f2050c60419d1b7 (diff) | |
| download | meta-qt5-5.14.0-rc.tar.gz | |
qt5: update submodulesv5.14.0-rc
- Update to latest content in Qt 5.14.0 branch
- Update Qt Enterprise License Agreement file to
version 4.2
Task-number: QTBUG-77876
Change-Id: I12d56637997f3c117c01f8889f1ebd9f9880dd49
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 70daedcf..6a60149e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
| 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
| 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
| 13 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ | 13 | file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \ |
| 14 | " | 14 | " |
| 15 | 15 | ||
| 16 | require qt5-native.inc | 16 | require qt5-native.inc |
| @@ -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 = "a131d6100ca13b00721ea30e6ef0d5225002867e" | 145 | SRCREV = "a5cbff60f063d271500e31eba5bd236741d2367b" |
