diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-27 10:33:46 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-27 11:11:46 +0000 |
commit | 200a22e5b07e17eec3c449776f4ce843d5401ebb (patch) | |
tree | 25a03256f2c913e6d5217f08aea21476fcf96b98 | |
parent | b51e24b0a5b0693fc741e85a599d67608ad8620c (diff) | |
download | meta-qt5-200a22e5b07e17eec3c449776f4ce843d5401ebb.tar.gz |
qt5: update submodulesv5.12.0-rc2
Update to 5.12.0 RC2
Task-number: QTBUG-71658
Change-Id: I06a5bb0b716f11102bcba50c9b8369bcea8fddf3
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/qtquickcontrols_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 3fbd2b7c..2887502a 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 = "8e8c11f4f3d5ccb8b1a9042d363e4d1639797df3" | 197 | SRCREV = "61373dff502fd222f68ed84c90bcc1822c4498e6" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index fc6d4519..4c140bf5 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 = "8e8c11f4f3d5ccb8b1a9042d363e4d1639797df3" | 140 | SRCREV = "61373dff502fd222f68ed84c90bcc1822c4498e6" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index f77fc729..8f8ade74 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 = "8e8c11f4f3d5ccb8b1a9042d363e4d1639797df3" | 259 | SRCREV = "61373dff502fd222f68ed84c90bcc1822c4498e6" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 2ec2ca31..f3415701 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ | |||
17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "08a6a6489e12450befcace2659f123e6c1f1be9a" | 20 | SRCREV = "7250a5c2f9dbb61e2c8289f1bf28db2300ce43ad" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 57cd36dd..3a6c1759 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 = "41ed53bf6603858856124f9e8593b804f4e6d1c8" | 27 | SRCREV = "e4631d1a6aa20dfdd32fff2e3764223435fe427f" |
28 | 28 | ||
29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index a8717644..6dc88b9c 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 = "a55cf07c63a1440b35075480fc2960161dfb60d9" | 35 | SRCREV = "63f128103f666e72f5f547871da44e49a9cbafaf" |
36 | 36 | ||
37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 21413980..c853a009 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -168,7 +168,7 @@ 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 = "e0668e653ae3931c5ff70731ac79a5ca9cb52de2" | 171 | SRCREV_qtwebengine = "a64ac508573096297723d6f3bb95770a9504ca85" |
172 | SRCREV_chromium = "91432e048e9bef479cc61f97d6ab4599121a1990" | 172 | SRCREV_chromium = "91432e048e9bef479cc61f97d6ab4599121a1990" |
173 | SRCREV = "${SRCREV_qtwebengine}" | 173 | SRCREV = "${SRCREV_qtwebengine}" |
174 | 174 | ||