diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-05-30 16:33:45 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-06 10:08:03 +0000 |
commit | 044ba1621532deed80ef79a15f5b225d8b9471ec (patch) | |
tree | 5e0535b85b98375f6ce325fb5a7ce9d358a09465 | |
parent | 5c9a409813ee5935f99e0e0e8955a470863b8210 (diff) | |
download | meta-qt5-044ba1621532deed80ef79a15f5b225d8b9471ec.tar.gz |
qt5: update to Qt 5.10 from dev branch
Use dev branch to build Qt 5.10.
Change-Id: Ib4bba18a99e95c63b3280b83e9bf19de29b466a8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
38 files changed, 64 insertions, 71 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 5040a1a4..5a6b7070 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() { | |||
191 | 191 | ||
192 | addtask generate_qt_environment_file after do_install before do_package | 192 | addtask generate_qt_environment_file after do_install before do_package |
193 | 193 | ||
194 | SRCREV = "31374105940bb15a68683a0ae691e7fe1f9b049a" | 194 | SRCREV = "4480f47f7b0f81483b0cf3c8327eff12938ca018" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index f0f960af..794ce1c5 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -34,6 +34,6 @@ do_configure_prepend() { | |||
34 | ${S}/src/quick3d/imports/input/importsinput.pro | 34 | ${S}/src/quick3d/imports/input/importsinput.pro |
35 | } | 35 | } |
36 | 36 | ||
37 | SRCREV = "f39d0a0c32cc489849a0cd5c2880f6e824223485" | 37 | SRCREV = "11a7585b75def904f7450eea50455ca6e8e9396f" |
38 | 38 | ||
39 | BBCLASSEXTEND += "native nativesdk" | 39 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index b7fee9c9..78c754ce 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -2,7 +2,7 @@ | |||
2 | # Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com> |
3 | 3 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.9" | 5 | QT_MODULE_BRANCH ?= "dev" |
6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" |
7 | 7 | ||
8 | # each module needs to define valid SRCREV | 8 | # each module needs to define valid SRCREV |
@@ -12,4 +12,4 @@ SRC_URI = " \ | |||
12 | 12 | ||
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | 14 | ||
15 | PV = "5.9.0+git${SRCPV}" | 15 | PV = "5.10.0+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index a786f33a..de8a1e75 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -109,4 +109,4 @@ do_install() { | |||
109 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} | 109 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} |
110 | } | 110 | } |
111 | 111 | ||
112 | SRCREV = "31374105940bb15a68683a0ae691e7fe1f9b049a" | 112 | SRCREV = "4480f47f7b0f81483b0cf3c8327eff12938ca018" |
diff --git a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch index fb3d316f..8ca2c8c4 100644 --- a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1b94b0f2579edcf870bc953f820af8fb2ec4376f Mon Sep 17 00:00:00 2001 | 1 | From b63b2819b88ef252a078e7ef595f7f370ec0c050 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH] Always build uic | 4 | Subject: [PATCH] Always build uic and qvkgen |
5 | 5 | ||
6 | Even if we are not building gui or widgets. This tool is needed later | 6 | Even if we are not building gui or widgets. This tool is needed later |
7 | as a native tool when compiling the target. | 7 | as a native tool when compiling the target. |
@@ -14,15 +14,15 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/src.pro b/src/src.pro | 16 | diff --git a/src/src.pro b/src/src.pro |
17 | index 3d18540..d128b3a 100644 | 17 | index a2064b1..9fae335 100644 |
18 | --- a/src/src.pro | 18 | --- a/src/src.pro |
19 | +++ b/src/src.pro | 19 | +++ b/src/src.pro |
20 | @@ -195,7 +195,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent | 20 | @@ -211,7 +211,7 @@ qtConfig(gui) { |
21 | } | 21 | } |
22 | } | 22 | } |
23 | } | 23 | } |
24 | -SUBDIRS += src_plugins | 24 | -SUBDIRS += src_plugins |
25 | +SUBDIRS += src_plugins src_tools_uic | 25 | +SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen |
26 | 26 | ||
27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
28 | 28 | ||
diff --git a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch index e72601ca..9c5f8fef 100644 --- a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch +++ b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001 | 1 | From 9bd7ad277698be81db2af1a86d5b4efad5818203 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Mon, 6 Mar 2017 11:50:38 +0100 | 3 | Date: Mon, 6 Mar 2017 11:50:38 +0100 |
4 | Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped | 4 | Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped |
@@ -9,15 +9,16 @@ Content-Transfer-Encoding: 8bit | |||
9 | 9 | ||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | 11 | ||
12 | Change-Id: I14e9b9a2bb4aca08d408c8aa76a2c58b54e74e7d | ||
12 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | 13 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
13 | --- | 14 | --- |
14 | src/src.pro | 9 ++------- | 15 | src/src.pro | 9 ++------- |
15 | src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +-- | 16 | src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 1 + |
16 | src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +---- | 17 | src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 1 + |
17 | 3 files changed, 4 insertions(+), 13 deletions(-) | 18 | 3 files changed, 4 insertions(+), 7 deletions(-) |
18 | 19 | ||
19 | diff --git a/src/src.pro b/src/src.pro | 20 | diff --git a/src/src.pro b/src/src.pro |
20 | index 90d7e2b..0aaf604 100644 | 21 | index a2064b1..d6f05e0 100644 |
21 | --- a/src/src.pro | 22 | --- a/src/src.pro |
22 | +++ b/src/src.pro | 23 | +++ b/src/src.pro |
23 | @@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private | 24 | @@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private |
@@ -30,7 +31,7 @@ index 90d7e2b..0aaf604 100644 | |||
30 | src_qtzlib.file = $$PWD/corelib/qtzlib.pro | 31 | src_qtzlib.file = $$PWD/corelib/qtzlib.pro |
31 | src_qtzlib.target = sub-zlib | 32 | src_qtzlib.target = sub-zlib |
32 | 33 | ||
33 | @@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap | 34 | @@ -41,13 +38,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap |
34 | 35 | ||
35 | src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp | 36 | src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp |
36 | src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp | 37 | src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp |
@@ -44,36 +45,28 @@ index 90d7e2b..0aaf604 100644 | |||
44 | -else: src_tools_qdbuscpp2xml.depends = src_dbus | 45 | -else: src_tools_qdbuscpp2xml.depends = src_dbus |
45 | +src_tools_qdbuscpp2xml.depends = src_dbus | 46 | +src_tools_qdbuscpp2xml.depends = src_dbus |
46 | 47 | ||
47 | src_winmain.subdir = $$PWD/winmain | 48 | src_tools_qvkgen.subdir = tools/qvkgen |
48 | src_winmain.target = sub-winmain | 49 | src_tools_qvkgen.target = sub-qvkgen |
49 | diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 50 | diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro |
50 | index 5ac3159..74c507c 100644 | 51 | index 5ac3159..65de97e 100644 |
51 | --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 52 | --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro |
52 | +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 53 | +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro |
53 | @@ -1,7 +1,6 @@ | 54 | @@ -1,5 +1,6 @@ |
54 | option(host_build) | 55 | option(host_build) |
55 | QT = core-private | 56 | QT = core-private |
56 | -force_bootstrap: QT += bootstrap_dbus-private | 57 | +CONFIG -= force_bootstrap |
57 | -else: QT += dbus-private | 58 | force_bootstrap: QT += bootstrap_dbus-private |
58 | +QT += dbus-private | 59 | else: QT += dbus-private |
59 | DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH | 60 | DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH |
60 | QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS | ||
61 | |||
62 | diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 61 | diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro |
63 | index d9ee5de..e891103 100644 | 62 | index 95fcbcb..d1ebdde 100644 |
64 | --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 63 | --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro |
65 | +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 64 | +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro |
66 | @@ -1,9 +1,6 @@ | 65 | @@ -5,6 +5,7 @@ option(host_build) |
67 | option(host_build) | 66 | CONFIG += force_bootstrap |
68 | -!force_bootstrap:!qtConfig(commandlineparser): \ | 67 | } |
69 | - CONFIG += force_bootstrap | ||
70 | QT = core-private | 68 | QT = core-private |
71 | -force_bootstrap: QT += bootstrap_dbus-private | 69 | +CONFIG -= force_bootstrap |
72 | -else: QT += dbus-private | 70 | force_bootstrap: QT += bootstrap_dbus-private |
73 | +QT += dbus-private | 71 | else: QT += dbus-private |
74 | DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH | 72 | DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH |
75 | QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS | ||
76 | |||
77 | -- | ||
78 | 2.9.3 | ||
79 | |||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 96cdc36d..f130a0ac 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
182 | 182 | ||
183 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 183 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
184 | 184 | ||
185 | SRCREV = "31374105940bb15a68683a0ae691e7fe1f9b049a" | 185 | SRCREV = "4480f47f7b0f81483b0cf3c8327eff12938ca018" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index b2a07247..9dc7155d 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS = "qtdeclarative" | 11 | DEPENDS = "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "116737dc8fa244282dda95a8f13624b66fdb5521" | 13 | SRCREV = "88573c72949b4540ee1456375c64f6262c94a472" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 6b895aaa..236d82e5 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
10 | 10 | ||
11 | SRCREV = "de7f741c428febfe3c81a28f955996d2314953fc" | 11 | SRCREV = "826aa4dbfb31353d41fa7a6cdba28961c413b214" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 0d13dc40..4a4b975d 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 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "8dcbf68e4579e03ea6d2808ac0c670169b59d0df" | 22 | SRCREV = "d5063285a8e6c01c4e4fc16fe76ed162b8e21e1d" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 0cbd04e6..ee565d94 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
10 | 10 | ||
11 | SRCREV = "84490ff75be5acdaeb3fd93900e4ebf7ba8f539b" | 11 | SRCREV = "e7b022ec334ce6768c30402c1e17fe0a1e3a0bb0" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index a578a065..edff48dc 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { | |||
32 | 32 | ||
33 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 33 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
34 | 34 | ||
35 | SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a" | 35 | SRCREV = "7ab6f0dda1cbe4ffd154226996482bc6b092690b" |
36 | 36 | ||
37 | BBCLASSEXTEND =+ "native nativesdk" | 37 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 94f04a49..a6bf4470 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb | |||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" | |||
14 | 14 | ||
15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
16 | 16 | ||
17 | SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4" | 17 | SRCREV = "e5f9fbd342574bada201b5a96d8a2a68f2f37cf1" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index d98d77e9..9196173f 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -19,4 +19,4 @@ DEPENDS += "qtdeclarative" | |||
19 | 19 | ||
20 | RDEPENDS_${PN}-dev = "" | 20 | RDEPENDS_${PN}-dev = "" |
21 | 21 | ||
22 | SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78" | 22 | SRCREV = "d424a1d208f09431d62e1de391dfaa037742456c" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 4dd64df2..3b6a6e1b 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" | |||
26 | 26 | ||
27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
28 | 28 | ||
29 | SRCREV = "71ccf0dff82835ce7b5aed74c37829afdef44cde" | 29 | SRCREV = "175dcf6e565bd638601697bfa6becd3a3321a0de" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index af295769..56e7fac0 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -24,7 +24,7 @@ SRC_URI += " \ | |||
24 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 24 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
25 | " | 25 | " |
26 | 26 | ||
27 | SRCREV_qtlocation = "888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f" | 27 | SRCREV_qtlocation = "22d980c8124026eb712f563326d5a5c1b180c671" |
28 | SRCREV_qtlocation-mapboxgl = "d45c177e8a23eefcc94930af9fa085e61136bb94" | 28 | SRCREV_qtlocation-mapboxgl = "edd127ee7658ceb7f5f2f740bce75db1cbf25c0e" |
29 | 29 | ||
30 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 30 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index c1ae7862..8cd7aac0 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -29,4 +29,4 @@ SRC_URI += "\ | |||
29 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 29 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
30 | " | 30 | " |
31 | 31 | ||
32 | SRCREV = "559c305ded730e23505e8b29536a98dc59e2acfa" | 32 | SRCREV = "badecdbc46df6ada383f1dfd006fa3dfff1706c6" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index eb5e4f61..28b92667 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 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6" | 12 | SRCREV = "c071b588ce2b4d474845d553aa83120747dc46da" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index a84cfb32..e54adc8b 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" | 11 | DEPENDS += "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3" | 13 | SRCREV = "9bae6189fe8ad5d11bbec0b204b42cd71f4a375a" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 83ed908d..c06da0c8 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -26,4 +26,4 @@ SRC_URI += " \ | |||
26 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | 26 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ |
27 | " | 27 | " |
28 | 28 | ||
29 | SRCREV = "dacb91916b202208681471ba764504c7c7d086f0" | 29 | SRCREV = "9f085b889524a80d4064d6ac01dbdc817bb31060" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 550e0305..1ed086fd 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -11,4 +11,4 @@ require qt5-git.inc | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f" | 14 | SRCREV = "0f80a0ad9f80f9f78dc9e9efe8b601dea2487322" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index ae5e0da4..8aa5750c 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" | |||
25 | 25 | ||
26 | DEPENDS += "qtbase" | 26 | DEPENDS += "qtbase" |
27 | 27 | ||
28 | SRCREV = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c" | 28 | SRCREV = "88bea4e52f6bd4570b0424a93b1d2e5ca96e6c11" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index c2c00e1b..0c58cede 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
@@ -10,7 +10,7 @@ require qt5-git.inc | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
12 | 12 | ||
13 | SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1" | 13 | SRCREV = "b490e1b782ac28a82d7902f926f6e041ede179ca" |
14 | 14 | ||
15 | SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" | 15 | SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" |
16 | 16 | ||
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 17d06394..1405428d 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase qtdeclarative" | 14 | DEPENDS += "qtbase qtdeclarative" |
15 | 15 | ||
16 | SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d" | 16 | SRCREV = "9a1b163e1fdd99a838c082805c687205b766da25" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 93a826bd..5e3c3cfd 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "20811e3b004af817e3f02982c755e8b1560b8c3d" | 14 | SRCREV = "6ba3a215494a829e73e62f5bd73f5b769874267d" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 957000c4..9ec6d8d2 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "687f5a9bd44a45a29d24925f29470c43d6729dee" | 18 | SRCREV = "65dba188d51d6dc67a15483f26c6b94a21abf5bc" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index fb8d44e1..6fe88e51 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "4fd787e90c70afbaa168abb3efdb8757ba77f3a4" | 15 | SRCREV = "1ef3d38562f686cf06b7a62be13cf9d3a23d0e41" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 9ca90a2c..1b811eaf 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
27 | 27 | ||
28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
29 | 29 | ||
30 | SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9" | 30 | SRCREV = "36defe5725bbed8e03d4f0ef676bc6afa99e6b04" |
31 | 31 | ||
32 | BBCLASSEXTEND = "native nativesdk" | 32 | BBCLASSEXTEND = "native nativesdk" |
33 | 33 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 822517f6..02ec4bbb 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \ | |||
114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
115 | " | 115 | " |
116 | 116 | ||
117 | SRCREV = "3e727a890f7856978469ee38ef0619b1b59a8ca7" | 117 | SRCREV = "e51b921f6fa0fb64a8a7f4159024d1a2f1872772" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 6d45a508..fa92f2f5 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" | 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" |
51 | 51 | ||
52 | SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f" | 52 | SRCREV = "95c3d5e602c2053a3e0629ecadf1f99ffaa08eea" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 26ef8532..4271a783 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature | |||
37 | 37 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b" | 40 | SRCREV = "dbf418dce41fe08368d38a098a771348a5b3d0fd" |
41 | 41 | ||
42 | # From https://bugreports.qt.io/browse/QTBUG-57767 | 42 | # From https://bugreports.qt.io/browse/QTBUG-57767 |
43 | SRC_URI += " \ | 43 | SRC_URI += " \ |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index f1167a9e..f353c547 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \ | |||
17 | 17 | ||
18 | DEPENDS += "qtdeclarative qtwebsockets" | 18 | DEPENDS += "qtdeclarative qtwebsockets" |
19 | 19 | ||
20 | SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e" | 20 | SRCREV = "ed4be1f75314ddc004ea7c0d7c6af715252e4e5c" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 26d2e28d..a2647b5c 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -113,7 +113,7 @@ SRC_URI += " \ | |||
113 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 113 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
114 | " | 114 | " |
115 | 115 | ||
116 | SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2" | 116 | SRCREV_qtwebengine = "d4cb1d15ae8cf57b931b021490b0776cc70f0b32" |
117 | SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" | 117 | SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" |
118 | SRCREV = "${SRCREV_qtwebengine}" | 118 | SRCREV = "${SRCREV_qtwebengine}" |
119 | 119 | ||
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 286aecae..b8b6ee71 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" | |||
17 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" | 17 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" |
18 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" | 18 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" |
19 | 19 | ||
20 | SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22" | 20 | SRCREV = "7efef7478b60f6aeb7babb0663234cf8dcb8a265" |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 722af85e..6472ab92 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -85,4 +85,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db | |||
85 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | 85 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" |
86 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | 86 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" |
87 | 87 | ||
88 | SRCREV = "f27089657a207ef8c5c9d27d661d3d12c3af8df2" | 88 | SRCREV = "0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 41ec27f6..f39fb46f 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222" | 14 | SRCREV = "e5133f4f0bb7c01d7bd7fc499d8c148c03a5b500" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index bf03e9bb..fe0f57e0 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "9e83ff8713c1a3f69ce514bf3e31335194668da7" | 16 | SRCREV = "de4c1f09a00884a959bf7f53d38c204d14064c21" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 85563862..e60f3997 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \ | |||
16 | 16 | ||
17 | DEPENDS += "qtbase" | 17 | DEPENDS += "qtbase" |
18 | 18 | ||
19 | SRCREV = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52" | 19 | SRCREV = "a5984f0a63233e0e9608ce8ab66e6d2d0e6948e3" |
20 | 20 | ||
21 | BBCLASSEXTEND =+ "native nativesdk" | 21 | BBCLASSEXTEND =+ "native nativesdk" |