diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-14 16:04:54 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-15 06:02:34 +0000 |
| commit | 73da34a04dc847106de9c602c7d2475ff8c75260 (patch) | |
| tree | 2504b9736ba9d5add3a58dd4c3d54bf52c5bee2c | |
| parent | 39ec3ae90ae0a11c2f279fe7361e10b492e685b6 (diff) | |
| download | meta-qt5-73da34a04dc847106de9c602c7d2475ff8c75260.tar.gz | |
qt5: update qtbase
Update to Qt 5.9.7 RC [v2] - Update qtbase.
Amends commmit 39ec3ae90ae0a11c2f279fe7361e10b492e685b6
Task-number: QTBUG-69049
Change-Id: I345027f727611732d07486ea34b9b60280ca1aa2
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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 863aab15..6205af0f 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -200,4 +200,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 200 | 200 | ||
| 201 | addtask generate_qt_environment_file after do_install before do_package | 201 | addtask generate_qt_environment_file after do_install before do_package |
| 202 | 202 | ||
| 203 | SRCREV = "0b6765353ad16023e433627291f33491b35bc907" | 203 | SRCREV = "68ebafeba1980b299a6b82918014260827f4eeb5" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 303067ea..1fcbff80 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -125,4 +125,4 @@ do_install() { | |||
| 125 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 125 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | SRCREV = "0b6765353ad16023e433627291f33491b35bc907" | 128 | SRCREV = "68ebafeba1980b299a6b82918014260827f4eeb5" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 090f190b..184cf7a6 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -228,4 +228,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 228 | 228 | ||
| 229 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 229 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 230 | 230 | ||
| 231 | SRCREV = "0b6765353ad16023e433627291f33491b35bc907" | 231 | SRCREV = "68ebafeba1980b299a6b82918014260827f4eeb5" |
