diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-06-12 12:01:35 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-06-12 10:45:03 +0000 |
| commit | b4061d651c97663002bb514521e2b97e3c3b9e80 (patch) | |
| tree | 0ab3b0782f543763a840d2120f4602b918b009cf | |
| parent | 2d768e8a2fc3cfd789e3ad79c8088fa5cd7e7f03 (diff) | |
| download | meta-qt5-b4061d651c97663002bb514521e2b97e3c3b9e80.tar.gz | |
qtbase, qttools: update modules
Update qtbase & qttools with latest fixes for 5.13.0.
Amends commit 2d768e8a2fc3cfd789e3ad79c8088fa5cd7e7f03.
Task-number: QTBUG-72311
Change-Id: I8aa04e5d005a1007f1643fcaf7c9c90d8b05368a
Reviewed-by: Kari Oikarinen <kari.oikarinen@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/qttools_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 ea30edfc..44c2cd3c 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 193 | do_generate_qt_environment_file[umask] = "022" | 193 | do_generate_qt_environment_file[umask] = "022" |
| 194 | addtask generate_qt_environment_file after do_install before do_package | 194 | addtask generate_qt_environment_file after do_install before do_package |
| 195 | 195 | ||
| 196 | SRCREV = "2ea3e133c369deefeae0605ad2f32aaea52c9e97" | 196 | SRCREV = "90aefe0843a50aede26b8d411f46f3828dae25f1" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index cd7e47f8..b916ed95 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -141,4 +141,4 @@ do_install() { | |||
| 141 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 141 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | SRCREV = "2ea3e133c369deefeae0605ad2f32aaea52c9e97" | 144 | SRCREV = "90aefe0843a50aede26b8d411f46f3828dae25f1" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4e8dd167..8077d76b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 275 | 275 | ||
| 276 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 276 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 277 | 277 | ||
| 278 | SRCREV = "2ea3e133c369deefeae0605ad2f32aaea52c9e97" | 278 | SRCREV = "90aefe0843a50aede26b8d411f46f3828dae25f1" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index c9eb1c81..e33d17d2 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
| 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
| 33 | " | 33 | " |
| 34 | 34 | ||
| 35 | SRCREV = "c7c3e2f26af0842631c95f054600b6b90ef3675b" | 35 | SRCREV = "cc9250477eaa71a3f3ffd050591d4a9d835288ca" |
| 36 | 36 | ||
| 37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
| 38 | 38 | ||