diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-13 13:51:43 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-19 13:08:51 +0000 |
commit | 6bd7ab491793d92f0942d9d8726873a514302849 (patch) | |
tree | 208b45d07aaf2805a84152510dc58aeda0ef4dbd | |
parent | 5bd17acd072dd168bf1ecadde9cd2b9641c08c6c (diff) | |
download | meta-qt5-6bd7ab491793d92f0942d9d8726873a514302849.tar.gz |
qt5: update submodules
Change PV to 5.7.0
Change-Id: I525ba69fe3e0f881eee52f7ab56071d555dd8b89
Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
23 files changed, 27 insertions, 27 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 61878d5e..1a8b4882 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -240,4 +240,4 @@ fakeroot do_generate_qt_environment_file() { | |||
240 | 240 | ||
241 | addtask generate_qt_environment_file after do_install before do_package | 241 | addtask generate_qt_environment_file after do_install before do_package |
242 | 242 | ||
243 | SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" | 243 | SRCREV = "e64b2234e829cc47872225debcf80d6c06db18f0" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index c3a5bc5a..ef58e7c5 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \ | |||
27 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ | 27 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ |
28 | " | 28 | " |
29 | 29 | ||
30 | SRCREV = "be29a39ede4355a5aa18e93c27a75a1c3f81bde4" | 30 | SRCREV = "faf56f50608f9391d2a73ed7c61bfdd9c2afab78" |
31 | 31 | ||
32 | BBCLASSEXTEND += "native nativesdk" | 32 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 8f88b6d4..0bafab51 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -11,4 +11,4 @@ SRC_URI = " \ | |||
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | PV = "5.6.99+5.7.0-beta+git${SRCPV}" | 14 | PV = "5.7.0+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 899698ef..69fac0e7 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -115,4 +115,4 @@ do_install() { | |||
115 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 115 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
116 | } | 116 | } |
117 | 117 | ||
118 | SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" | 118 | SRCREV = "e64b2234e829cc47872225debcf80d6c06db18f0" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index d984b607..1f98eec0 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -207,4 +207,4 @@ do_install_append() { | |||
207 | 207 | ||
208 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 208 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
209 | 209 | ||
210 | SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" | 210 | SRCREV = "e64b2234e829cc47872225debcf80d6c06db18f0" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index b84ad040..10ba2758 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -25,4 +25,4 @@ do_configure_prepend() { | |||
25 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro | 25 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "f8759f683cfc433c432059e1160d2ab657baaec6" | 28 | SRCREV = "caded2edf69e8a60897653ace1e10b72199c7427" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 33a0e2d7..ed86ec5d 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -39,6 +39,6 @@ do_install_append_class-nativesdk() { | |||
39 | 39 | ||
40 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 40 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
41 | 41 | ||
42 | SRCREV = "31ef2e858c2a0835c040b3199c9557f0f6c66808" | 42 | SRCREV = "531d00c1909527cb1bc28f17197267ccde408b0c" |
43 | 43 | ||
44 | BBCLASSEXTEND =+ "native nativesdk" | 44 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 6c983c24..f097484a 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+ | |||
28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" |
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" |
30 | 30 | ||
31 | SRCREV = "42b07b2ddf443d3eafd18e169f2e5ab5e36604a5" | 31 | SRCREV = "68d9cfe5256c91510552c2b16d5efdb01e77ea57" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index ce240c52..ebc74314 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -29,4 +29,4 @@ do_configure_prepend() { | |||
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" |
30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" |
31 | 31 | ||
32 | SRCREV = "e41c3a9b345536ccee0840ac6f049173aa6a0785" | 32 | SRCREV = "761331ddc841809a4bdc6ca2f2b84c148cb9b19a" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 5c723376..f0ae8b99 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -35,4 +35,4 @@ SRC_URI += "\ | |||
35 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ | 35 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ |
36 | " | 36 | " |
37 | 37 | ||
38 | SRCREV = "c85fd6df07935b9c0fa08f881271cd94ad100003" | 38 | SRCREV = "08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7" |
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index e34cc227..2fb3cf61 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb | |||
@@ -25,4 +25,4 @@ do_configure_prepend() { | |||
25 | sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro | 25 | sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "5e3bd5cb28e7af95b289a617ca2f7a8892498225" | 28 | SRCREV = "26229cfa0b729313893af5674d604e8692dbb946" |
diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch index ad2b489d..9ad92a1c 100644 --- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch | |||
@@ -7,13 +7,13 @@ Upstream-Status: Pending | |||
7 | 7 | ||
8 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | 8 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> |
9 | --- | 9 | --- |
10 | examples/quick/controls/texteditor/src/documenthandler.cpp | 1 + | 10 | examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | 1 + |
11 | 1 file changed, 1 insertion(+) | 11 | 1 file changed, 1 insertion(+) |
12 | 12 | ||
13 | diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp | 13 | diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp |
14 | index bdecf5b..811a761 100644 | 14 | index bdecf5b..811a761 100644 |
15 | --- a/examples/quick/controls/texteditor/src/documenthandler.cpp | 15 | --- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp |
16 | +++ b/examples/quick/controls/texteditor/src/documenthandler.cpp | 16 | +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp |
17 | @@ -54,6 +54,7 @@ | 17 | @@ -54,6 +54,7 @@ |
18 | #include <QtGui/QTextCursor> | 18 | #include <QtGui/QTextCursor> |
19 | #include <QtGui/QFontDatabase> | 19 | #include <QtGui/QFontDatabase> |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 00fe4fc9..2af368ee 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 = "2a5c64a1ddf5b6fdb9104faf99260925a327b2f4" | 13 | SRCREV = "8b2e819ab2246d01eb564a52aa08bdf1d55c02c2" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 9231a79c..2fc35c16 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ SRC_URI += " \ | |||
17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | 17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "3411c3579fb9e767c819c0c8d9f35c52c9964b06" | 20 | SRCREV = "c6713e212ef0b97c45d6466b73220567e94a05f1" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 1098f25e..f0ed0ac9 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase qtdeclarative" | 16 | DEPENDS += "qtbase qtdeclarative" |
17 | 17 | ||
18 | SRCREV = "33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8" | 18 | SRCREV = "f32489e379805c51b28ae5d471491a649283fd8d" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index b16978ba..615f5329 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 = "84feab670cce8414ad54f4d19b46291c7fdb14cf" | 18 | SRCREV = "a11fa1dfd529948da961d3d292926a15f9b7005b" |
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index a467f998..39c815cf 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb | |||
@@ -30,4 +30,4 @@ do_install_append() { | |||
30 | 30 | ||
31 | QT_MODULE_BRANCH = "dev" | 31 | QT_MODULE_BRANCH = "dev" |
32 | 32 | ||
33 | SRCREV = "236b6b544fd2049eb46e8f79d13bb7aa35ba002f" | 33 | SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index fbc5a38a..caead933 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" | 32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" |
33 | 33 | ||
34 | SRCREV = "d36d2c3026cae67c119384f47cb2680552c81aaf" | 34 | SRCREV = "570f0f314cbe4603db34d4967b6a7dd35d174eba" |
35 | 35 | ||
36 | BBCLASSEXTEND = "native nativesdk" | 36 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 4364b2d0..2833bfe5 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -113,4 +113,4 @@ FILES_${PN}-qt = " \ | |||
113 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 113 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
114 | " | 114 | " |
115 | 115 | ||
116 | SRCREV = "745f8d5329d0d6d98a8577a254d2ee3e7174634e" | 116 | SRCREV = "c95337f7e974c75a88b96c168b6056a1642399bb" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 8e9aa2cd..fde962a1 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb | |||
@@ -25,4 +25,4 @@ do_install() { | |||
25 | oe_runmake install INSTALL_ROOT=${D} | 25 | oe_runmake install INSTALL_ROOT=${D} |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "bfa66ccb29f747e2cb07a4f2e561b165be9f211d" | 28 | SRCREV = "c07dc0c5cd138db2f222c6c58bc5778532cecf42" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 8f016583..5742a1a7 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -36,4 +36,4 @@ SRC_URI += " \ | |||
36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ | 36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ |
37 | " | 37 | " |
38 | 38 | ||
39 | SRCREV = "bfa66ccb29f747e2cb07a4f2e561b165be9f211d" | 39 | SRCREV = "c07dc0c5cd138db2f222c6c58bc5778532cecf42" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 8fb82220..92f3160f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -122,8 +122,8 @@ SRC_URI += " \ | |||
122 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 122 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
123 | " | 123 | " |
124 | 124 | ||
125 | SRCREV_qtwebengine = "63cf26268996ae5580c77095a252696fa549b593" | 125 | SRCREV_qtwebengine = "023168cf91dc7ac11ced1b6a60ca7aa248987810" |
126 | SRCREV_chromium = "ba40ed24a6d23e606397b650a7982b0998dbeaf4" | 126 | SRCREV_chromium = "46f522d613bb77600ed3a85580ff84ee9802e21b" |
127 | SRCREV = "${SRCREV_qtwebengine}" | 127 | SRCREV = "${SRCREV_qtwebengine}" |
128 | 128 | ||
129 | SRCREV_FORMAT = "qtwebengine_chromium" | 129 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 33cedd63..69a76763 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "fb1dc19bf195c530b7f44d18cc927472b9866a46" | 16 | SRCREV = "9751d3d82eecb4f2c2a805783fbcce9ccd189fea" |
17 | 17 | ||
18 | BBCLASSEXTEND =+ "native nativesdk" | 18 | BBCLASSEXTEND =+ "native nativesdk" |