diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-07 10:01:24 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-07 07:55:51 +0000 |
| commit | 49e9d9a73b5c6e3d6eab88dc0005305e85b1a62d (patch) | |
| tree | c9fd981ffb492f68252968b6121087ececf9ae47 | |
| parent | e04d79bf2371f7707763f4a624e880ef33a5ca0b (diff) | |
| download | meta-qt5-49e9d9a73b5c6e3d6eab88dc0005305e85b1a62d.tar.gz | |
qt5: update qtbasev5.9.6
Update submodules to Qt 5.9.6 RC3
Task-number: QTBUG-67815
Change-Id: Ie307b5021c13bab6edd7bec1ab1869f9d054b43b
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 5f9718ce..4612f37f 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 = "4e68ad5f120f9c883ad5fde5a68278ba3b01e8e3" | 203 | SRCREV = "9c50112304033c631e52f062496f3111f24835a2" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index d18c8e91..dd673f45 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 = "4e68ad5f120f9c883ad5fde5a68278ba3b01e8e3" | 128 | SRCREV = "9c50112304033c631e52f062496f3111f24835a2" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 7c8871a5..3a96284c 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 = "4e68ad5f120f9c883ad5fde5a68278ba3b01e8e3" | 231 | SRCREV = "9c50112304033c631e52f062496f3111f24835a2" |
