diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-01-26 08:33:58 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-15 10:21:47 +0000 |
commit | 869323e6405efe399e742c14583af34e25475de3 (patch) | |
tree | b2e64df2b258a84ff49230e14c257aeb9f952dd0 | |
parent | 47f349cb0b816dad03c73197a628b7d010a19754 (diff) | |
download | meta-boot2qt-869323e6405efe399e742c14583af34e25475de3.tar.gz |
qt5: update to latest Qt 5.6.0 revision
Change-Id: Iaa3437588906c1e60ded7d6e0c981a58f01a305f
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
31 files changed, 35 insertions, 30 deletions
diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5-addons/qtcharts_git.bb index 2c022b4..c6c1997 100644 --- a/recipes-qt/qt5-addons/qtcharts_git.bb +++ b/recipes-qt/qt5-addons/qtcharts_git.bb | |||
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3 | |||
26 | inherit qt5-module qtquickcompiler | 26 | inherit qt5-module qtquickcompiler |
27 | require recipes-qt/qt5/qt5-git.inc | 27 | require recipes-qt/qt5/qt5-git.inc |
28 | 28 | ||
29 | QT_MODULE_BRANCH = "5.6" | ||
29 | SRCREV = "672ea1cb191f9d386ce32b96102fe638fcae5fba" | 30 | SRCREV = "672ea1cb191f9d386ce32b96102fe638fcae5fba" |
30 | 31 | ||
31 | DEPENDS = "qtbase qtdeclarative qtmultimedia" | 32 | DEPENDS = "qtbase qtdeclarative qtmultimedia" |
diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5-addons/qtdatavis3d_git.bb index a148bdc..155c8f0 100644 --- a/recipes-qt/qt5-addons/qtdatavis3d_git.bb +++ b/recipes-qt/qt5-addons/qtdatavis3d_git.bb | |||
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal | |||
26 | inherit qt5-module | 26 | inherit qt5-module |
27 | require recipes-qt/qt5/qt5-git.inc | 27 | require recipes-qt/qt5/qt5-git.inc |
28 | 28 | ||
29 | QT_MODULE_BRANCH = "5.6" | ||
29 | SRCREV = "4f23f0f984ef2ee96d5baa3a74a465d6734381ba" | 30 | SRCREV = "4f23f0f984ef2ee96d5baa3a74a465d6734381ba" |
30 | 31 | ||
31 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 32 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb index 9aaf2ff..bdca585 100644 --- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb +++ b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb | |||
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer. | |||
26 | inherit qt5-module | 26 | inherit qt5-module |
27 | require recipes-qt/qt5/qt5-git.inc | 27 | require recipes-qt/qt5/qt5-git.inc |
28 | 28 | ||
29 | QT_MODULE_BRANCH = "5.6" | ||
29 | SRCREV = "849ee6c976ba3574b1856eb9d16c2bd740a6d2e3" | 30 | SRCREV = "849ee6c976ba3574b1856eb9d16c2bd740a6d2e3" |
30 | 31 | ||
31 | DEPENDS = "qtbase qtdeclarative" | 32 | DEPENDS = "qtbase qtdeclarative" |
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb index 8594dc5..d6b36fb 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb | |||
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e | |||
26 | inherit qt5-module qtquickcompiler | 26 | inherit qt5-module qtquickcompiler |
27 | require recipes-qt/qt5/qt5-git.inc | 27 | require recipes-qt/qt5/qt5-git.inc |
28 | 28 | ||
29 | QT_MODULE_BRANCH = "5.6" | ||
29 | SRCREV = "91273471991b8f1097780f8171f19e7efc622be5" | 30 | SRCREV = "91273471991b8f1097780f8171f19e7efc622be5" |
30 | 31 | ||
31 | DEPENDS = "qtbase qtdeclarative qtsvg hunspell" | 32 | DEPENDS = "qtbase qtdeclarative qtsvg hunspell" |
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index a525959..97d53ea 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | |||
@@ -24,4 +24,4 @@ EXTRA_QTLIB_append = " Network Sql" | |||
24 | # Needed by qttools | 24 | # Needed by qttools |
25 | EXTRA_QTLIB_append = " Xml" | 25 | EXTRA_QTLIB_append = " Xml" |
26 | 26 | ||
27 | SRCREV = "3880f41e683f02b905c8cbc3c578c3f3a0a1eb2e" | 27 | SRCREV = "8c2b4266002736da499d169a0da187e5cdc5381a" |
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index e816436..59b6b33 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend | |||
@@ -25,7 +25,7 @@ SRC_URI_append_class-target = " \ | |||
25 | file://0001-Remove-qgltf.patch \ | 25 | file://0001-Remove-qgltf.patch \ |
26 | " | 26 | " |
27 | 27 | ||
28 | SRCREV = "ab5dcff44a80884834c5e480e59a2424003c39f1" | 28 | SRCREV = "190795b1f884620ba8b31d3998ac97107d4f4eb7" |
29 | 29 | ||
30 | DEPENDS += "qt3d-native" | 30 | DEPENDS += "qt3d-native" |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 4363833..b6e5a33 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "3880f41e683f02b905c8cbc3c578c3f3a0a1eb2e" | 22 | SRCREV = "8c2b4266002736da499d169a0da187e5cdc5381a" |
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index c0641c1..efab850 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend | |||
@@ -35,7 +35,7 @@ PACKAGECONFIG += " \ | |||
35 | xkbcommon-evdev \ | 35 | xkbcommon-evdev \ |
36 | " | 36 | " |
37 | 37 | ||
38 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | 38 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
39 | 39 | ||
40 | SRC_URI += " \ | 40 | SRC_URI += " \ |
41 | file://oe-device-extra.pri \ | 41 | file://oe-device-extra.pri \ |
@@ -44,7 +44,7 @@ do_configure_prepend() { | |||
44 | install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs | 44 | install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs |
45 | } | 45 | } |
46 | 46 | ||
47 | SRCREV = "3880f41e683f02b905c8cbc3c578c3f3a0a1eb2e" | 47 | SRCREV = "8c2b4266002736da499d169a0da187e5cdc5381a" |
48 | 48 | ||
49 | # Temporarily here, until merged upstream | 49 | # Temporarily here, until merged upstream |
50 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" | 50 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index ef7433e..d5807f8 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "bb1504c271e18a26ad6ac20d55485c167671b1c2" | 22 | SRCREV = "f669d1708c1009adc7d82d42bf550e0d971e827f" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 97a2a1e..6841ebe 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend | |||
@@ -21,4 +21,4 @@ | |||
21 | 21 | ||
22 | PACKAGECONFIG += "bluez4" | 22 | PACKAGECONFIG += "bluez4" |
23 | 23 | ||
24 | SRCREV = "9d3e7e9c2edb38a6bca9bb6c1cdef02c0a329ec4" | 24 | SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 12f332a..09944d9 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "a4b2fa94d28327b83c8a1ddce5741c29cb0a7e0c" | 22 | SRCREV = "19dffeed2e677cf03b6e122c7a15f355ebe413c8" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index fff3b75..972f725 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "3f240169388d2f3090cd5730e03df8d8ab670510" | 22 | SRCREV = "2f0e5e726d76b8ad5a0e9b07aeb57006490e18b4" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index e0bbea2..4213bc9 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "6730d70f001c9492d32a6a8e95c304a52d7ddc35" | 22 | SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869" |
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index f928317..956edc9 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend | |||
@@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy" | |||
24 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" | 24 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" |
25 | DEPENDS_emulator += "qtsimulator" | 25 | DEPENDS_emulator += "qtsimulator" |
26 | 26 | ||
27 | SRCREV = "cf6bf74b900db1efd2f2c6d51313505fade267ee" | 27 | SRCREV = "a2b6581e5a865ec1a3a7006b668e36c64d2f7ef5" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index 2662c2a..589bbbc 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend | |||
@@ -21,4 +21,4 @@ | |||
21 | 21 | ||
22 | PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" | 22 | PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" |
23 | 23 | ||
24 | SRCREV = "315a946e4088f9b5e8c4aad76fbb155654688172" | 24 | SRCREV = "d633c02ce21b4b5aa9d9877c9424fcc0f363aa6b" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 9414c13..2e0fa7b 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -31,7 +31,7 @@ LIC_FILES_CHKSUM = " \ | |||
31 | 31 | ||
32 | DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects" | 32 | DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects" |
33 | 33 | ||
34 | SRCREV = "47b3a29210042c22627a04445055bdacf1f9c722" | 34 | SRCREV = "7fc567eda8a187e365f4c29c6e8f08440bf31218" |
35 | 35 | ||
36 | FILES_${PN}-qmldesigner += " \ | 36 | FILES_${PN}-qmldesigner += " \ |
37 | ${OE_QMAKE_PATH_QML}/*/*/*/designer \ | 37 | ${OE_QMAKE_PATH_QML}/*/*/*/designer \ |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index c83ca28..f899df0 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "5a992a14da4334364d81ad8d9e0b270ad0bb370d" | 22 | SRCREV = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df" |
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index aa5db59..457e0fd 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend | |||
@@ -22,4 +22,4 @@ | |||
22 | EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" | 22 | EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" |
23 | DEPENDS_emulator += "qtsimulator" | 23 | DEPENDS_emulator += "qtsimulator" |
24 | 24 | ||
25 | SRCREV = "3b334c8e10628a362f54651884a6552966e74a02" | 25 | SRCREV = "ad52d307cbff44b77bf7d4fa923377b72bb04374" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index c8e4776..bea6a92 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -24,11 +24,11 @@ require recipes-qt/qt5/qt5-git.inc | |||
24 | 24 | ||
25 | LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0)" | 25 | LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0)" |
26 | LIC_FILES_CHKSUM = " \ | 26 | LIC_FILES_CHKSUM = " \ |
27 | file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ | 27 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ |
28 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 28 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ |
29 | file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ | 29 | file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ |
30 | " | 30 | " |
31 | 31 | ||
32 | DEPENDS += "qtbase qtserialport" | 32 | DEPENDS += "qtbase qtserialport" |
33 | 33 | ||
34 | SRCREV = "11661526113009079c22ed18701c17543c62c25c" | 34 | SRCREV = "e2c26722fad7ce4b034682ca697abfe4743ef19a" |
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index b1ce4f0..915e9b3 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "afe2f2386ecfdc3d0d3fe46f7d1662ab0b6851ce" | 22 | SRCREV = "6dda140ada3d7c683537b069bf1512275a190884" |
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index 03ad0cd..56a80d9 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "84eae855ee57ab1c37c8a84ad7e7afcd40b919e6" | 22 | SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c" |
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index a133bfc..932f535 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "fe4c8a36bccf83b0026ef000af69cbc41b269386" | 22 | SRCREV = "eb59d8084af321d05b4ebdfb2c1e051dfdca0b62" |
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index 9488e7b..e8b1d19 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend | |||
@@ -19,7 +19,7 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "2d9a8c83893be4abde136ec87fc3db220ce8a0a5" | 22 | SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" |
23 | 23 | ||
24 | PACKAGES += "${PN}-qtwebengine" | 24 | PACKAGES += "${PN}-qtwebengine" |
25 | FILES_${PN}-qtwebengine = " \ | 25 | FILES_${PN}-qtwebengine = " \ |
diff --git a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb index cd54903..455726a 100644 --- a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb +++ b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb | |||
@@ -23,6 +23,6 @@ require recipes-qt/qt5/qtwayland-native_git.bb | |||
23 | 23 | ||
24 | FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:" | 24 | FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:" |
25 | 25 | ||
26 | SRCREV = "22caa63a70245087e0fca51f2186597c232e2d21" | 26 | SRCREV = "2adae188cb916d5a6ffbee65abf4ee8144de9ec2" |
27 | PV = "5.7-wip+git${SRCPV}" | 27 | PV = "5.7-wip+git${SRCPV}" |
28 | QT_MODULE_BRANCH = "wip-compositor-api" | 28 | QT_MODULE_BRANCH = "wip-compositor-api" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 5d1b41b..cd4d339 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "f51de354b14d5a25d7e32debe0d56b9fbed67a4f" | 22 | SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360" |
diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb index b3dcfe7..58dfccd 100644 --- a/recipes-qt/qt5/qtwayland_5.7-wip.bb +++ b/recipes-qt/qt5/qtwayland_5.7-wip.bb | |||
@@ -21,8 +21,9 @@ | |||
21 | 21 | ||
22 | require recipes-qt/qt5/qtwayland_git.bb | 22 | require recipes-qt/qt5/qtwayland_git.bb |
23 | 23 | ||
24 | SRCREV = "22caa63a70245087e0fca51f2186597c232e2d21" | 24 | SRCREV = "2adae188cb916d5a6ffbee65abf4ee8144de9ec2" |
25 | PV = "5.7-wip+git${SRCPV}" | 25 | PV = "5.7-wip+git${SRCPV}" |
26 | QT_MODULE_BRANCH = "wip-compositor-api" | 26 | QT_MODULE_BRANCH = "wip-compositor-api" |
27 | EXTRA_QMAKEVARS_PRE += "CONFIG+=explicitlib" | ||
27 | 28 | ||
28 | SRC_URI_remove = "file://0001-examples-wayland-include-server-buffer-only-when-bui.patch" | 29 | SRC_URI_remove = "file://0001-examples-wayland-include-server-buffer-only-when-bui.patch" |
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 5d1b41b..cd4d339 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "f51de354b14d5a25d7e32debe0d56b9fbed67a4f" | 22 | SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360" |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index 7b129ac..ac958c0 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "97577a0f27a1f427948871ae535645a2e0788bf7" | 22 | SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index ea9b1a6..a57f074 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend | |||
@@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ | |||
25 | file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ | 25 | file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ |
26 | " | 26 | " |
27 | 27 | ||
28 | SRCREV_qtwebengine = "e9ed15cfb271d42723622ae353304141e0bf2c64" | 28 | SRCREV_qtwebengine = "87cc80fd8182b24ff42f0f5458cb82f139730536" |
29 | SRCREV_chromium = "4cb3a5a4f03774ae47d69a84a3423d14e59a2d2e" | 29 | SRCREV_chromium = "3f655a31b4979b0862e5aec1c8f47b597464749f" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index 2a81e0a..287ed42 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend | |||
@@ -19,4 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "8ba610490e2d93526c165584e2f52c7ae8e9edc0" | 22 | SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915" |
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 1ae57ce..b95a8dc 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -25,7 +25,7 @@ | |||
25 | path="sources/meta-openembedded"/> | 25 | path="sources/meta-openembedded"/> |
26 | <project name="meta-qt5" | 26 | <project name="meta-qt5" |
27 | remote="qtyocto" | 27 | remote="qtyocto" |
28 | revision="95549f64bb26b7a27ed27028309fd3760dde5f83" | 28 | revision="72ac998cef3306e6e4d2f3760af1c21cedfc330f" |
29 | path="sources/meta-qt5"/> | 29 | path="sources/meta-qt5"/> |
30 | 30 | ||
31 | <project name="meta-mingw" | 31 | <project name="meta-mingw" |