summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-06-13 08:42:52 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-08-11 07:14:08 +0000
commitd7d6fcb2da15e49ad42b119f50b58a35c4b6498e (patch)
tree3f43cdf7432ca9f7cb381db6fb657338d1b65fd7
parentaf576e137e0aa8bde0e6b4fcb8b4011fa0769277 (diff)
downloadmeta-boot2qt-d7d6fcb2da15e49ad42b119f50b58a35c4b6498e.tar.gz
qt5: update meta-qt5
* Include merged upstream/krogoth content * Include first 5.6.3 submodule update snapshot * Use meta-qt5 submodule SHA1s directly instead of meta-boot2qt overrides * Clean obsolete/overlapping content from .bbappends Change-Id: I3ae72197a64f67c1856210a45f5e49331e1cc03d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat
-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.bbappend5
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative-render2d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtlocation_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bbappend1
-rw-r--r--recipes-qt/qt5/qtquickcompiler_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bbappend24
-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.bbappend22
-rw-r--r--recipes-qt/qt5/qtsvg_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtsystems_git.bbappend2
-rw-r--r--recipes-qt/qt5/qttools_git.bbappend22
-rw-r--r--recipes-qt/qt5/qttranslations_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtwayland_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bbappend3
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bbappend22
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bbappend22
-rw-r--r--scripts/manifest.xml3
32 files changed, 9 insertions, 361 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 7debc2e..057e1c3 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -19,8 +19,6 @@
19## 19##
20############################################################################## 20##############################################################################
21 21
22SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6"
23
24FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" 22FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
25 23
26SRC_URI += "\ 24SRC_URI += "\
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index 349ef9a..c248b4e 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -24,5 +24,3 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
24SRC_URI_append_class-target = " \ 24SRC_URI_append_class-target = " \
25 file://0001-Remove-qgltf.patch \ 25 file://0001-Remove-qgltf.patch \
26 " 26 "
27
28SRCREV = "d3889211dc245d44dab25dcc9fbbc4b57e92ac33"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 4ab7742..03f200e 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -19,8 +19,6 @@
19## 19##
20############################################################################## 20##############################################################################
21 21
22SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6"
23
24FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" 22FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
25 23
26SRC_URI += "\ 24SRC_URI += "\
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index cdb1566..2c4e5dd 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -44,8 +44,3 @@ SRC_URI += " \
44do_configure_prepend() { 44do_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
48SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6"
49
50# Temporarily here, until merged upstream
51PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
deleted file mode 100644
index 2c3ba90..0000000
--- a/recipes-qt/qt5/qtcanvas3d_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "85fe2daab5ed14655b456df8821c9f5f606fdc12"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 359c43d..bbaf985 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3
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 = "1474e311738e2676b65c4c40dc7ff0dbf4d6a5bd" 29SRCREV = "4cdf7b5ca4e72c815ead5a1b2044adb54e10d9d0"
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
deleted file mode 100644
index f57a619..0000000
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "bd7649557e99be543b78492d96bb2982e0a3e4c4"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 9b9f239..cecd5a1 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal
26inherit qt5-module 26inherit qt5-module
27require recipes-qt/qt5/qt5-git.inc 27require recipes-qt/qt5/qt5-git.inc
28 28
29SRCREV = "4d4a9609fab58da304e4c13b9a37531116a4fadb" 29SRCREV = "b6731b7e776a8aa2d47ac04f00c2af7d2be6c650"
30 30
31DEPENDS += "qtbase qtdeclarative qtmultimedia" 31DEPENDS += "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb
index 8597315..4008b98 100644
--- a/recipes-qt/qt5/qtdeclarative-render2d_git.bb
+++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bb
@@ -26,6 +26,6 @@ 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
29SRCREV = "d09edf104dd05b472d3004484cc9bd47befb0a3d" 29SRCREV = "66182394f50ecaa55d6ef3b54383a823d8ebb248"
30 30
31DEPENDS = "qtbase qtdeclarative" 31DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
deleted file mode 100644
index f46ba76..0000000
--- a/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "c1d726fe19c83cf081042e55ace9d9d7b31c40e6"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
deleted file mode 100644
index f164c73..0000000
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b5"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
deleted file mode 100644
index afa85cb..0000000
--- a/recipes-qt/qt5/qtimageformats_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "d7bdc138b89bf0c52ba9ddf22b34d2ccd06b3936"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index a318e4e..0e72b71 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -23,5 +23,3 @@ PACKAGECONFIG += "gypsy"
23 23
24EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" 24EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
25DEPENDS_emulator += "qtsimulator" 25DEPENDS_emulator += "qtsimulator"
26
27SRCREV = "7d01112c36a98912706e9d33ce2e36126de0ccec"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index fd551c6..3b0e7d9 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -23,4 +23,3 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)
23 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 23 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" 24 ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}"
25 25
26SRCREV = "20686cb51fb2dfa5973d636875e9fc20c2bde4f5"
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index e0091b4..4bb8c1c 100644
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5/qtquickcompiler_git.bb
@@ -29,7 +29,7 @@ SRC_URI = " \
29 git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ 29 git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \
30 " 30 "
31 31
32SRCREV = "382935b1c5c93fba9ff2f25b74ec6a5337ec62d0" 32SRCREV = "1b697bdf0924dcdc8d3865b7dbaebbd4dcebe514"
33BRANCH = "5.6" 33BRANCH = "5.6"
34 34
35S = "${WORKDIR}/git" 35S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index c6dec9f..e9330bc 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 = "e93c73c0aa15cd973e008a04a70a7c69719ad244" 34SRCREV = "be77d8798a1df1cb928b944c145db3fa9aeb9777"
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
deleted file mode 100644
index 895e4f8..0000000
--- a/recipes-qt/qt5/qtquickcontrols_git.bbappend
+++ /dev/null
@@ -1,24 +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
22FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
23
24SRCREV = "59c6c0e0b1b5b46747595a58e11311b7393d7e70"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index 4407369..c6277b5 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -21,5 +21,3 @@
21 21
22EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" 22EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
23DEPENDS_emulator += "qtsimulator" 23DEPENDS_emulator += "qtsimulator"
24
25SRCREV = "922c2bb671c113b7e481fb86f823188b4bce1d3e"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index e4ef3c7..26c0aea 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 = "0a4a5f7e1cbca7bd8b797603025534368de02cb7" 34SRCREV = "0c60b2c10bd30e1ccb775a3fb406ba1e8214b1c3"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
deleted file mode 100644
index 1bf4848..0000000
--- a/recipes-qt/qt5/qtserialport_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "46ef9fdc130a06bd80c5c004f0dc95c473f704c8"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
deleted file mode 100644
index 755a49b..0000000
--- a/recipes-qt/qt5/qtsvg_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "2d55b4996eaa26c973afdf15f6f703c0a1840a96"
diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend
index 45a8ea6..6723c4a 100644
--- a/recipes-qt/qt5/qtsystems_git.bbappend
+++ b/recipes-qt/qt5/qtsystems_git.bbappend
@@ -21,5 +21,3 @@
21 21
22EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" 22EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
23DEPENDS_emulator += "qtsimulator" 23DEPENDS_emulator += "qtsimulator"
24
25SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
deleted file mode 100644
index 44f6b33..0000000
--- a/recipes-qt/qt5/qttools_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e"
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
deleted file mode 100644
index d33921b..0000000
--- a/recipes-qt/qt5/qttranslations_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "225e1740fec4559bf8d66d915ddd06b9d4f48119"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index e7ab947..cabe52d 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e
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 = "13a199e6e2c5f27b0f12eff380df4f0c0d156e6e" 29SRCREV = "57d7fae10dbd5a2fd01fdd89c3aeb1024c9a0295"
30 30
31DEPENDS = "qtbase qtdeclarative qtsvg hunspell" 31DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
32 32
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
deleted file mode 100644
index b886d31..0000000
--- a/recipes-qt/qt5/qtwayland-native_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
deleted file mode 100644
index b886d31..0000000
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
deleted file mode 100644
index 7e87e21..0000000
--- a/recipes-qt/qt5/qtwebchannel_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "3b28a6956cb3cab087481312dc82a907b118e0de"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index 35c9471..43250cc 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -24,6 +24,3 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
24SRC_URI_append_mx6 = " \ 24SRC_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
28SRCREV_qtwebengine = "ec84507898e58a167b185ba674acf300cc695380"
29SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
deleted file mode 100644
index 274e4a4..0000000
--- a/recipes-qt/qt5/qtwebsockets_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "ef7b03e3e5e20f89963bae799f7ecb753f332c34"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
deleted file mode 100644
index 8594a95..0000000
--- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend
+++ /dev/null
@@ -1,22 +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
22SRCREV = "074571305e45d30066b199641eb5d0866e3b0a92"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 973aa69..1894f64 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -11,6 +11,7 @@
11 <remote fetch="git://github.com/architech-boards" name="architech"/> 11 <remote fetch="git://github.com/architech-boards" name="architech"/>
12 <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> 12 <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
13 <remote fetch="git://code.qt.io/yocto" name="qtyocto"/> 13 <remote fetch="git://code.qt.io/yocto" name="qtyocto"/>
14 <remote fetch="ssh://codereview.qt-project.org/yocto" name="gerrit"/>
14 <remote fetch="git://git.yoctoproject.org" name="intel"/> 15 <remote fetch="git://git.yoctoproject.org" name="intel"/>
15 <remote fetch="git://github.com/openembedded" name="oe-mirror"/> 16 <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
16 <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> 17 <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
@@ -25,7 +26,7 @@
25 path="sources/meta-openembedded"/> 26 path="sources/meta-openembedded"/>
26 <project name="meta-qt5" 27 <project name="meta-qt5"
27 remote="qtyocto" 28 remote="qtyocto"
28 revision="8d3770b5fe81d13212d84151664ceb080fc60302" 29 revision="b72dbdfcb6e1e3c520de216cda4d0893d6372bd2"
29 path="sources/meta-qt5"/> 30 path="sources/meta-qt5"/>
30 <project name="meta-mingw" 31 <project name="meta-mingw"
31 remote="qtyocto" 32 remote="qtyocto"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-12 21:42:13 +0000