summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-03-11 15:47:30 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2016-04-13 09:30:24 +0000
commit17412f4a768e36ba5ecd899610f556424a9471df (patch)
tree8413be839b94d774c2adb0158dcbd95f4d9fa2fa
parent579d003d7696ea399b839e430bd8a976d9bb6f66 (diff)
downloadmeta-boot2qt-17412f4a768e36ba5ecd899610f556424a9471df.tar.gz
qt5: move to Qt 5.7
Change-Id: I1479b6337a07542ae536e9df97e77921745b7c2e Reviewed-by: David Schulz <david.schulz@theqtcompany.com> Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
-rw-r--r--conf/distro/b2qt.conf3
-rw-r--r--recipes-qt/b2qt-addons/democompositor_git.bb1
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb1
-rw-r--r--recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb1
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bbappend2
-rw-r--r--recipes-qt/qt5/qt3d_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtbase_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb (renamed from recipes-qt/qt5-addons/qtcharts_git.bb)6
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb (renamed from recipes-qt/qt5-addons/qtdatavis3d_git.bb)6
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bbappend8
-rw-r--r--recipes-qt/qt5/qttools_git.bbappend2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb (renamed from recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb)6
-rw-r--r--recipes-qt/qt5/qtwayland-native_5.7-wip.bb28
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtwayland_5.7-wip.bb29
-rw-r--r--recipes-qt/qt5/qtwayland_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bbappend4
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bbappend2
-rw-r--r--scripts/manifest.xml2
-rw-r--r--scripts/manifest_jethro.xml2
37 files changed, 42 insertions, 103 deletions
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 1505797..9c597e4 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -48,6 +48,9 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
48 48
49FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache" 49FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
50 50
51# backport from oe/krogoth, needed by meta-qt5
52EXTRA_CONF_PACKAGECONFIG = "${EXTRA_OECONF}"
53
51# use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10 54# use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
52DISTRO_FEATURES += "gstreamer" 55DISTRO_FEATURES += "gstreamer"
53 56
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
index 314e491..7a5322d 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/recipes-qt/b2qt-addons/democompositor_git.bb
@@ -36,7 +36,6 @@ PV = "5.6+git${SRCPV}"
36S = "${WORKDIR}/git/wayland/democompositor/" 36S = "${WORKDIR}/git/wayland/democompositor/"
37 37
38DEPENDS = "qtbase qtwayland" 38DEPENDS = "qtbase qtwayland"
39RDEPENDS_${PN} = "qtwayland (>= 5.7)"
40 39
41do_install_append() { 40do_install_append() {
42 install -d -m0775 ${D}/usr/bin 41 install -d -m0775 ${D}/usr/bin
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 7e8ce67..edb9625 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -29,7 +29,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
29RDEPENDS_${PN} += " \ 29RDEPENDS_${PN} += " \
30 qt3d \ 30 qt3d \
31 qtbase \ 31 qtbase \
32 qtbase-fonts \
33 qtcanvas3d \ 32 qtcanvas3d \
34 qtcharts \ 33 qtcharts \
35 qtconnectivity \ 34 qtconnectivity \
diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
index 5162519..de9f504 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.
26inherit qt5-module 26inherit qt5-module
27require recipes-qt/qt5/qt5-git.inc 27require recipes-qt/qt5/qt5-git.inc
28 28
29QT_MODULE_BRANCH = "dev"
29SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62" 30SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62"
30 31
31DEPENDS = "qtbase qtdeclarative" 32DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index a63c8b0..436dcfe 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -19,7 +19,7 @@
19## 19##
20############################################################################## 20##############################################################################
21 21
22SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" 22SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0"
23 23
24FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" 24FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
25 25
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index 7cec73a..5df447f 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -25,4 +25,4 @@ SRC_URI_append_class-target = " \
25 file://0001-Remove-qgltf.patch \ 25 file://0001-Remove-qgltf.patch \
26 " 26 "
27 27
28SRCREV = "7a208d76ed96bb506899becfe680df06f95451c7" 28SRCREV = "a21a4e0391b81307d96364db7af3b8bd343d773f"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 76c3986..94a27f1 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -19,7 +19,7 @@
19## 19##
20############################################################################## 20##############################################################################
21 21
22SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" 22SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0"
23 23
24FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" 24FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
25 25
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index eaab0a6..0ae3cfb 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -45,7 +45,7 @@ do_configure_prepend() {
45 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs 45 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
46} 46}
47 47
48SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" 48SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0"
49 49
50# Temporarily here, until merged upstream 50# Temporarily here, until merged upstream
51PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" 51PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index 0a8d678..c8c57a3 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
22SRCREV = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18" 22SRCREV = "4f4eda51954b7983016e6a062d3db77a68c2ad67"
diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 5e95d14..9286462 100644
--- a/recipes-qt/qt5-addons/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -20,12 +20,12 @@
20############################################################################## 20##############################################################################
21 21
22DESCRIPTION = "Qt Charts" 22DESCRIPTION = "Qt Charts"
23LICENSE = "QtEnterprise" 23LICENSE = "GPL-3.0"
24LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3985;beginline=1;endline=17" 24LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
25 25
26inherit qt5-module qtquickcompiler 26inherit qt5-module qtquickcompiler
27require recipes-qt/qt5/qt5-git.inc 27require recipes-qt/qt5/qt5-git.inc
28 28
29SRCREV = "f4ba2fb9840279f986bd11ab6860e6a3125d9599" 29SRCREV = "bbf52870f4e335c0d169907d4398a12cb41ca3a1"
30 30
31DEPENDS = "qtbase qtdeclarative qtmultimedia" 31DEPENDS = "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index 67cd0dd..fa3bf05 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -19,5 +19,5 @@
19## 19##
20############################################################################## 20##############################################################################
21 21
22SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3" 22SRCREV = "f8857127320f513e9ec2132bc4af5c470362f37a"
23 23
diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index a148bdc..d238835 100644
--- a/recipes-qt/qt5-addons/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -20,12 +20,12 @@
20############################################################################## 20##############################################################################
21 21
22DESCRIPTION = "Qt Data Visualization" 22DESCRIPTION = "Qt Data Visualization"
23LICENSE = "QtEnterprise" 23LICENSE = "GPL-3.0"
24LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal.h;md5=80b80e41be7c22f5b90fc96163b7d1bf;beginline=1;endline=17" 24LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
25 25
26inherit qt5-module 26inherit qt5-module
27require recipes-qt/qt5/qt5-git.inc 27require recipes-qt/qt5/qt5-git.inc
28 28
29SRCREV = "4f23f0f984ef2ee96d5baa3a74a465d6734381ba" 29SRCREV = "3fb7ce6a29ca69237c777cc65a3831768e938782"
30 30
31DEPENDS += "qtbase qtdeclarative qtmultimedia" 31DEPENDS += "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index 804c736..1db39fc 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
22SRCREV = "dc558b69f083c89aa8c02952e5f167405939a61a" 22SRCREV = "f5afec250cc63ba3a7b1cc78f51d5eb0031dd478"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
index d5da008..901b376 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
22SRCREV = "4b8e9a348ca379b203c26ff14dd236267dd60646" 22SRCREV = "f086de0f3a67698b8066576a423298aadf566e13"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
index 4213bc9..7ff0b30 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
22SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869" 22SRCREV = "2d59367241aafbfe6acb30202f64e30697028bd9"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index 3b3bae1..ebd6c21 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy"
24EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" 24EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
25DEPENDS_emulator += "qtsimulator" 25DEPENDS_emulator += "qtsimulator"
26 26
27SRCREV = "ca4bce553d03a64fa119650990083267ea9c8d31" 27SRCREV = "e176f25daeb3d80af1fd701000fda065064227e1"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index ca77e8c..4c11a32 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -21,4 +21,4 @@
21 21
22PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" 22PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}"
23 23
24SRCREV = "9985224a89b830dc182b428f491b6187d6f0e1ba" 24SRCREV = "0d8366273dcb9af5dae641c7efbc6db878942422"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 2e0fa7b..8dc1203 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -31,7 +31,7 @@ LIC_FILES_CHKSUM = " \
31 31
32DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects" 32DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects"
33 33
34SRCREV = "7fc567eda8a187e365f4c29c6e8f08440bf31218" 34SRCREV = "78ec7b84abd5f499c83b0b2076fb47617a2ebbb7"
35 35
36FILES_${PN}-qmldesigner += " \ 36FILES_${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 7d64fdc..b1ad2a5 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
22SRCREV = "85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b" 22SRCREV = "c24118685d6eb4cacf5f6af96215ba89ecc28604"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index c9c89ed..21ff48a 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -22,4 +22,4 @@
22EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" 22EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
23DEPENDS_emulator += "qtsimulator" 23DEPENDS_emulator += "qtsimulator"
24 24
25SRCREV = "7197e7f4b385315cb241043495cbfad58deb911a" 25SRCREV = "f8e256271f919c36c8d97eae27b1d11678294e70"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 1605b7b..dd69582 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -31,4 +31,4 @@ LIC_FILES_CHKSUM = " \
31 31
32DEPENDS += "qtbase qtserialport" 32DEPENDS += "qtbase qtserialport"
33 33
34SRCREV = "48f32572590e45a57573944c0822855819d138df" 34SRCREV = "ee4c1b91def347f8f16395585b46e20aebdb2f7b"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
index e0b0c7e..f33a067 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
22SRCREV = "03d492e49e74eefa1c83e37e833d862f4b9f1e45" 22SRCREV = "f8449352c9af0ee8055c6a85981e092e9d109b9d"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
index 56a80d9..b7da638 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
22SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c" 22SRCREV = "8c23084b207baed7cf58c17e475baa34b889ead2"
diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend
index 3d02409..c8c7671 100644
--- a/recipes-qt/qt5/qtsystems_git.bbappend
+++ b/recipes-qt/qt5/qtsystems_git.bbappend
@@ -22,10 +22,4 @@
22EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" 22EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
23DEPENDS_emulator += "qtsimulator" 23DEPENDS_emulator += "qtsimulator"
24 24
25SRCREV = "37b614abbfb35d06a57e5b0824249c3abd5640e3" 25SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a"
26
27LIC_FILES_CHKSUM = " \
28 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
29 file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
30 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
31"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index 4200c4d..ccb03b7 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
22SRCREV = "9904992dc4eb9a5958fcfbac238374ff38498143" 22SRCREV = "f29f0a4855eefba944e2dd99e0d6d992b9ebbb1c"
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
index 5045c67..a6bc131 100644
--- a/recipes-qt/qt5/qttranslations_git.bbappend
+++ b/recipes-qt/qt5/qttranslations_git.bbappend
@@ -19,4 +19,4 @@
19## 19##
20############################################################################## 20##############################################################################
21 21
22SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" 22SRCREV = "745f8d5329d0d6d98a8577a254d2ee3e7174634e"
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index f4bdbcc..bf33b42 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -20,13 +20,13 @@
20############################################################################## 20##############################################################################
21 21
22DESCRIPTION = "Qt Virtual Keyboard" 22DESCRIPTION = "Qt Virtual Keyboard"
23LICENSE = "QtEnterprise" 23LICENSE = "GPL-3.0"
24LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e83db02b9629bbd;beginline=1;endline=17" 24LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
25 25
26inherit qt5-module qtquickcompiler 26inherit qt5-module qtquickcompiler
27require recipes-qt/qt5/qt5-git.inc 27require recipes-qt/qt5/qt5-git.inc
28 28
29SRCREV = "4d480f8f0c1ca3308f4c3a423ad30d5d44e9c1bf" 29SRCREV = "84881cfc58a462189dfeff60c6d6f5717bc4b6b5"
30 30
31DEPENDS = "qtbase qtdeclarative qtsvg hunspell" 31DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
32 32
diff --git a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb
deleted file mode 100644
index 455726a..0000000
--- a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1##############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: http://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:COMM$
9##
10## Commercial License Usage
11## Licensees holding valid commercial Qt licenses may use this file in
12## accordance with the commercial license agreement provided with the
13## Software or, alternatively, in accordance with the terms contained in
14## a written agreement between you and The Qt Company. For licensing terms
15## and conditions see http://www.qt.io/terms-conditions. For further
16## information use the contact form at http://www.qt.io/contact-us.
17##
18## $QT_END_LICENSE$
19##
20##############################################################################
21
22require recipes-qt/qt5/qtwayland-native_git.bb
23
24FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:"
25
26SRCREV = "2adae188cb916d5a6ffbee65abf4ee8144de9ec2"
27PV = "5.7-wip+git${SRCPV}"
28QT_MODULE_BRANCH = "wip-compositor-api"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
index 9e48cab..9783d9e 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
22SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" 22SRCREV = "01daa660d04e8960961988da6191e80c05a84d58"
diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb
deleted file mode 100644
index 2de879b..0000000
--- a/recipes-qt/qt5/qtwayland_5.7-wip.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1##############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: http://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:COMM$
9##
10## Commercial License Usage
11## Licensees holding valid commercial Qt licenses may use this file in
12## accordance with the commercial license agreement provided with the
13## Software or, alternatively, in accordance with the terms contained in
14## a written agreement between you and The Qt Company. For licensing terms
15## and conditions see http://www.qt.io/terms-conditions. For further
16## information use the contact form at http://www.qt.io/contact-us.
17##
18## $QT_END_LICENSE$
19##
20##############################################################################
21
22require recipes-qt/qt5/qtwayland_git.bb
23
24SRCREV = "0b9967d0f16652b0c77d454923bb7a1423792658"
25PV = "5.7-wip+git${SRCPV}"
26QT_MODULE_BRANCH = "wip-compositor-api"
27EXTRA_QMAKEVARS_PRE += "CONFIG+=explicitlib"
28
29SRC_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 9e48cab..9783d9e 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
22SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" 22SRCREV = "01daa660d04e8960961988da6191e80c05a84d58"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
index ac958c0..ee19a33 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
22SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea" 22SRCREV = "a2c3b32d08ed24279609a8c01b09c1147a9ff6b9"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index 0f684cc..4ba8dcf 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
28SRCREV_qtwebengine = "5c4ae298b0a3d75c4c5ea8aef0595914ab25607f" 28SRCREV_qtwebengine = "1d8efc0b6c26baf4fdf5a7a9a136bf3f7bb8c0f2"
29SRCREV_chromium = "e63eb5276c8d141853e2c26bf1bac469ed60465f" 29SRCREV_chromium = "eed57693d22920959d6b7c8f2b1b90b501994760"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
index 528e5b6..09c180c 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bbappend
+++ b/recipes-qt/qt5/qtwebsockets_git.bbappend
@@ -19,4 +19,4 @@
19## 19##
20############################################################################## 20##############################################################################
21 21
22SRCREV = "88946bbe209cb6148b4a3284077bb9a06c7bc1ef" 22SRCREV = "c6d19a89046763f680d7f67c6f9989b4f51fc71e"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
index 287ed42..1397eea 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
22SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915" 22SRCREV = "20e5ddeba66121e59058fbe00896e25b5f82ed44"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 30ff5e7..74cee35 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="e29477ac42b47f4fedd2cb4be27ec2e4aa70540c" 28 revision="e6897ccd0eec8fb5229e0fdd8f354292e0f49a16"
29 path="sources/meta-qt5"/> 29 path="sources/meta-qt5"/>
30 30
31 <project name="meta-mingw" 31 <project name="meta-mingw"
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
index 95ed55e..c9b86b2 100644
--- a/scripts/manifest_jethro.xml
+++ b/scripts/manifest_jethro.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="master-mingw" 28 revision="5.7"
29 path="sources/meta-qt5"/> 29 path="sources/meta-qt5"/>
30 30
31 <project name="meta-mingw" 31 <project name="meta-mingw"