diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-16 11:05:22 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-19 07:40:09 +0000 |
commit | decb5d93229f8c381e7509e139bf0c865d8ab0c3 (patch) | |
tree | 9930c5593ad5ccf76a1a019a13d9e2bccd8d61da | |
parent | 96685678ddb4adf615d037dd4c1dcca23023df19 (diff) | |
download | meta-qt5-decb5d93229f8c381e7509e139bf0c865d8ab0c3.tar.gz |
qt5: update submodules
Update to proposed Qt 5.12.0 RC
Change-Id: If0eed33248c553188bc33cb377ae44c5aa2360f9
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 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 |
8 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 01513a33..3fbd2b7c 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 = "98a445fa23e7943f25d2de2f1fb36c104d5d7fda" | 197 | SRCREV = "8e8c11f4f3d5ccb8b1a9042d363e4d1639797df3" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 814627a7..fc6d4519 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 = "98a445fa23e7943f25d2de2f1fb36c104d5d7fda" | 140 | SRCREV = "8e8c11f4f3d5ccb8b1a9042d363e4d1639797df3" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index b516f570..f77fc729 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 = "98a445fa23e7943f25d2de2f1fb36c104d5d7fda" | 259 | SRCREV = "8e8c11f4f3d5ccb8b1a9042d363e4d1639797df3" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index e10c4e5f..f34b9e37 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { | |||
24 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 24 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
25 | } | 25 | } |
26 | 26 | ||
27 | SRCREV = "e3948955c961972d34483e7da9c2908f5cb84420" | 27 | SRCREV = "ec290770ff56791a62fde6f532e1b38e80f5b9bd" |
28 | 28 | ||
29 | BBCLASSEXTEND =+ "native nativesdk" | 29 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 3c53fd85..5b2c6315 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "0b5f60148f4992381ae79f399b243ecb2774d2ba" | 13 | SRCREV = "d3545dbdfdb30e310c6c962ba92f4fdf57354666" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 4d351d91..57cd36dd 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
24 | 24 | ||
25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
26 | 26 | ||
27 | SRCREV = "cf5ab210939bcb49f5d79a60ba480fe2a93aa1af" | 27 | SRCREV = "41ed53bf6603858856124f9e8593b804f4e6d1c8" |
28 | 28 | ||
29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 074a0102..b90ed759 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
49 | 49 | ||
50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
51 | 51 | ||
52 | SRCREV = "5d2d0564a36f99224dc53ad477416097516c6b77" | 52 | SRCREV = "0966a84a2a0fa95215ddc2fcb757b92704f9a0c5" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 83fa313c..523361d8 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -168,8 +168,8 @@ SRC_URI_append_libc-musl = "\ | |||
168 | file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch;patchdir=src/3rdparty \ | 168 | file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch;patchdir=src/3rdparty \ |
169 | " | 169 | " |
170 | 170 | ||
171 | SRCREV_qtwebengine = "40bd9e91108045f1e393f4c98d19cd8df4ee73ce" | 171 | SRCREV_qtwebengine = "5f4e77307b38e2f8155063e249a6c98802b9175f" |
172 | SRCREV_chromium = "d521ec6dd1ed0114b9c6d32b047fb024420a6cda" | 172 | SRCREV_chromium = "91432e048e9bef479cc61f97d6ab4599121a1990" |
173 | SRCREV = "${SRCREV_qtwebengine}" | 173 | SRCREV = "${SRCREV_qtwebengine}" |
174 | 174 | ||
175 | SRCREV_FORMAT = "qtwebengine_chromium" | 175 | SRCREV_FORMAT = "qtwebengine_chromium" |