diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-12-03 16:10:17 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-12-03 14:28:00 +0000 |
commit | 6830447387d2bfaef1e855040068df2a7f19d485 (patch) | |
tree | 5c68233f33ce4c258cd9d63c676396f702beb1f9 | |
parent | 200a22e5b07e17eec3c449776f4ce843d5401ebb (diff) | |
download | meta-qt5-6830447387d2bfaef1e855040068df2a7f19d485.tar.gz |
qt5: update submodulesv5.12.0
Final update for Qt 5.12.0
Change-Id: I99c486004797cb9488dd2d8f0dbb6ea3213ac002
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@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 2887502a..3d2bda27 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() { | |||
194 | do_generate_qt_environment_file[umask] = "022" | 194 | do_generate_qt_environment_file[umask] = "022" |
195 | addtask generate_qt_environment_file after do_install before do_package | 195 | addtask generate_qt_environment_file after do_install before do_package |
196 | 196 | ||
197 | SRCREV = "61373dff502fd222f68ed84c90bcc1822c4498e6" | 197 | SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 4c140bf5..6ae87af2 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -137,4 +137,4 @@ do_install() { | |||
137 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 137 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
138 | } | 138 | } |
139 | 139 | ||
140 | SRCREV = "61373dff502fd222f68ed84c90bcc1822c4498e6" | 140 | SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 8f8ade74..4e6d21ba 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -256,4 +256,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
256 | 256 | ||
257 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 257 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
258 | 258 | ||
259 | SRCREV = "61373dff502fd222f68ed84c90bcc1822c4498e6" | 259 | SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" |