summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-10-11 09:43:29 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2018-10-15 06:00:43 +0000
commite6bbbf6f225d4ae926342d4c2f49976641bea8c0 (patch)
treee2dfe18592e33a316c909c42e25451262e9a8727
parent13c852b79587fe8495744cc8523322c9eadd72ae (diff)
downloadmeta-qt5-e6bbbf6f225d4ae926342d4c2f49976641bea8c0.tar.gz
qt5: update submodules
Update to latest Qt 5.12.0 snapshot Task-number: QTBUG-70847 Change-Id: Ic909ffe6ba3ba3eb1e0751a86ef51abe0eeb57f1 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch12
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
19 files changed, 24 insertions, 24 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index c8af32e6..880c13c8 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -208,4 +208,4 @@ fakeroot do_generate_qt_environment_file() {
208do_generate_qt_environment_file[umask] = "022" 208do_generate_qt_environment_file[umask] = "022"
209addtask generate_qt_environment_file after do_install before do_package 209addtask generate_qt_environment_file after do_install before do_package
210 210
211SRCREV = "18be2337ea85655e39f4ffe3b77d2b3ab243c140" 211SRCREV = "5c94130a6708a7f7b4631645e52abd8768a48b7b"
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index de6826bd..d62c3d5a 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,4 +1,4 @@
1From 46137e8cf94fd24fe5270739da72e03b7bb92673 Mon Sep 17 00:00:00 2001 1From 55670231dcc22e00e08ec44acda8ca93c9368860 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
@@ -10,12 +10,12 @@ Subject: [PATCH] Allow a tools-only build
10 3 files changed, 8 insertions(+), 3 deletions(-) 10 3 files changed, 8 insertions(+), 3 deletions(-)
11 11
12diff --git a/qt3d.pro b/qt3d.pro 12diff --git a/qt3d.pro b/qt3d.pro
13index 6f759b293..5f07c7c4e 100644 13index 3fc7d14..7311eff 100644
14--- a/qt3d.pro 14--- a/qt3d.pro
15+++ b/qt3d.pro 15+++ b/qt3d.pro
16@@ -1,4 +1,4 @@ 16@@ -1,4 +1,4 @@
17-requires(qtConfig(opengl):!html5) 17-requires(qtConfig(opengl):!wasm)
18+!tools-only:requires(qtConfig(opengl):!html5) 18+!tools-only:requires(qtConfig(opengl):!wasm)
19 19
20 CONFIG += examples_need_tools 20 CONFIG += examples_need_tools
21 load(qt_parts) 21 load(qt_parts)
@@ -29,7 +29,7 @@ index 6f759b293..5f07c7c4e 100644
29+ SUBDIRS = sub_tools 29+ SUBDIRS = sub_tools
30+} 30+}
31diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri 31diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
32index 8ba2d9a41..e973d93dd 100644 32index 8ba2d9a..e973d93 100644
33--- a/src/3rdparty/assimp/assimp_dependency.pri 33--- a/src/3rdparty/assimp/assimp_dependency.pri
34+++ b/src/3rdparty/assimp/assimp_dependency.pri 34+++ b/src/3rdparty/assimp/assimp_dependency.pri
35@@ -1,5 +1,5 @@ 35@@ -1,5 +1,5 @@
@@ -40,7 +40,7 @@ index 8ba2d9a41..e973d93dd 100644
40 } else { 40 } else {
41 include(assimp.pri) 41 include(assimp.pri)
42diff --git a/tools/tools.pro b/tools/tools.pro 42diff --git a/tools/tools.pro b/tools/tools.pro
43index c2f692034..24c49ad5a 100644 43index c2f6920..24c49ad 100644
44--- a/tools/tools.pro 44--- a/tools/tools.pro
45+++ b/tools/tools.pro 45+++ b/tools/tools.pro
46@@ -1,5 +1,5 @@ 46@@ -1,5 +1,5 @@
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 4c72d78c..459750fa 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
36 ${S}/src/quick3d/imports/input/importsinput.pro 36 ${S}/src/quick3d/imports/input/importsinput.pro
37} 37}
38 38
39SRCREV = "ece6a7759d4590b50ced79a0c86323318ac8815d" 39SRCREV = "6c77dea4711b6a88e80e30db21d622808e5ef9b6"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index c5f1c37d..0803e612 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -134,4 +134,4 @@ do_install() {
134 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 134 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
135} 135}
136 136
137SRCREV = "18be2337ea85655e39f4ffe3b77d2b3ab243c140" 137SRCREV = "5c94130a6708a7f7b4631645e52abd8768a48b7b"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 396e5aa9..2d699196 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -250,4 +250,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
250 250
251RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 251RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
252 252
253SRCREV = "18be2337ea85655e39f4ffe3b77d2b3ab243c140" 253SRCREV = "5c94130a6708a7f7b4631645e52abd8768a48b7b"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 3d421cef..7ecd1e90 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "3ad4866256e9efdc313ac557326c2796dfac8dfb" 11SRCREV = "bd9f0b27169dcbc3f8bb3914d3e21b1daddeeee5"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index a1dcb5cb..f5cfe314 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "54f9fe2c230963797dd4f0f9efed7132b0dc429e" 22SRCREV = "35a97ca4b43b4dc481b907d37204613460b07bbd"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 2335671d..73a007c5 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "913b61e09d5aead27be69fc31eefb4178a64e69a" 11SRCREV = "12d9593daeb8ffc7e50d068923afaf848083dcd4"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 92a0afe3..f265494b 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -33,6 +33,6 @@ do_install_append_class-nativesdk() {
33 33
34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
35 35
36SRCREV = "ec866a4d72ee5d07c44257d409796c171bcd04f2" 36SRCREV = "7cd9447e14159be90a5fdb927a4a3ed2cbff50b2"
37 37
38BBCLASSEXTEND =+ "native nativesdk" 38BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 9ed43c1f..6d208b58 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -31,7 +31,7 @@ SRC_URI += " \
31 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 31 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
32" 32"
33 33
34SRCREV_qtlocation = "eaffef633e98e2ea94acf5fd0e1a10676591bfa8" 34SRCREV_qtlocation = "8b702b66aa09d6e59da1c99af353eac36cff01e4"
35SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" 35SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
36 36
37SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 37SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 0c497620..3ee82705 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -37,4 +37,4 @@ SRC_URI += "\
37# http://errors.yoctoproject.org/Errors/Build/44914/ 37# http://errors.yoctoproject.org/Errors/Build/44914/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "ad9f763efea36663bf17321459d44e8dd5e5e653" 40SRCREV = "7750d9014ee38cffe349af5c50f715774e7b1982"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index d80fcd56..e59bbccd 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "876cd89e273851f6e430d1f9ea47f6e667716c89" 12SRCREV = "0930d394d7e2aa51499fc4f735556c97da85afe8"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 96e21d49..315f9dd0 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "4bfbdd3d061e88de147102db94e70283b89ffff5" 14SRCREV = "7577cd3fa7ebfa35b199d485233f3b41cec79e46"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 983952aa..ebed3e08 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
35SRCREV = "ede2bcd3a9dacd31e0b274b2591850dd15cf8b7d" 35SRCREV = "1251d22560474bd5272ed31923bd42122a39f9ae"
36 36
37BBCLASSEXTEND = "native nativesdk" 37BBCLASSEXTEND = "native nativesdk"
38 38
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index c825415e..9526069c 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
50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
51 51
52SRCREV = "2c603d66246e80b1f974b9ad5f712136d83bb354" 52SRCREV = "6bcc33aea90d5d725a08b51eda7374a50408ee07"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 5a85d042..352e0185 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "a1ca3ae56f33bff34db71d1dec6104d0d6614e6d" 40SRCREV = "43d12496c684b5f2b08c6a8c0b994f06efc25712"
41 41
42BBCLASSEXTEND =+ "native nativesdk" 42BBCLASSEXTEND =+ "native nativesdk"
43 43
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 62242f04..85943b0f 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -172,7 +172,7 @@ SRC_URI_append_libc-musl = "\
172 file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 172 file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
173" 173"
174 174
175SRCREV_qtwebengine = "f89ded9f17a59ca1ffe4d8711c0af4d54489e105" 175SRCREV_qtwebengine = "8b0f6b343dd807236001cacbae9bacb7e4923369"
176SRCREV_chromium = "3f8994c671d1cfc674ab64e118304b897a84762c" 176SRCREV_chromium = "3f8994c671d1cfc674ab64e118304b897a84762c"
177SRCREV = "${SRCREV_qtwebengine}" 177SRCREV = "${SRCREV_qtwebengine}"
178 178
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index dc91d360..34108d40 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "cd0814a2431db435279cf775a0fca460a0b81582" 22SRCREV = "eea4b92dbb1c333f073e6ad7f146957ac95624aa"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 2956d480..1f1ddec3 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS += "qtbase" 15DEPENDS += "qtbase"
16 16
17SRCREV = "d5762832ea8e5ca37457b2fa895bacf70173fde5" 17SRCREV = "7df0037316cc2efa7ac082231b72a3fe5dcdfe8f"
18 18
19BBCLASSEXTEND =+ "native nativesdk" 19BBCLASSEXTEND =+ "native nativesdk"
20 20