diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-03 14:23:37 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-05 09:22:47 +0000 |
commit | b45e88e7c2fb3ca5ec92f7986bae9ff1f76da93c (patch) | |
tree | 3fe0494ab1d8d108811bb68d1dfcdc2c693115e4 | |
parent | 8e507ffdf81ea6c169065ce487ca02048d17a6cd (diff) | |
download | meta-qt5-b45e88e7c2fb3ca5ec92f7986bae9ff1f76da93c.tar.gz |
qt5: update submodules
- Update Qt submodules to latest in 5.9.4 branch
- Remove obsolete qtquickcontrols & qtwayland
patches
Task-number: QTBUG-65028
Change-Id: Ib1da1db3b683dbe6ef5648e6b262f76ce89e2d01
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdatavis3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch | 24 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols_git.bb | 8 | ||||
-rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtscript_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtserialbus_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttranslations_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch | 68 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 9 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebview_git.bb | 2 |
19 files changed, 18 insertions, 123 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index cca31529..d2e4b0f3 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() { | |||
197 | 197 | ||
198 | addtask generate_qt_environment_file after do_install before do_package | 198 | addtask generate_qt_environment_file after do_install before do_package |
199 | 199 | ||
200 | SRCREV = "dc0bb57f8600374b7279d5c14456a33a9d0c0476" | 200 | SRCREV = "624a186295acc6695778e7224f9dae75e0e58f17" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 7bbf8892..3abcd186 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -125,4 +125,4 @@ do_install() { | |||
125 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 125 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
126 | } | 126 | } |
127 | 127 | ||
128 | SRCREV = "dc0bb57f8600374b7279d5c14456a33a9d0c0476" | 128 | SRCREV = "624a186295acc6695778e7224f9dae75e0e58f17" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 9d2d05f6..d2792f7f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -228,4 +228,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
228 | 228 | ||
229 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 229 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
230 | 230 | ||
231 | SRCREV = "dc0bb57f8600374b7279d5c14456a33a9d0c0476" | 231 | SRCREV = "624a186295acc6695778e7224f9dae75e0e58f17" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index a0b43b53..62d8ed95 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
10 | 10 | ||
11 | SRCREV = "de346171018b353d2abcfb589e644480c2aa6fd5" | 11 | SRCREV = "4cd89b61be205fc52ce1b227fe55e4de04196db7" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 96c1ef61..a2be36d2 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { | |||
30 | 30 | ||
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
32 | 32 | ||
33 | SRCREV = "243b819ff73f6aaa9dc068d43b8b918a98f53663" | 33 | SRCREV = "0dbdfaa78d9c3ac0c1a9cfff440d753b159a3a14" |
34 | 34 | ||
35 | BBCLASSEXTEND =+ "native nativesdk" | 35 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 652c8430..7a00a825 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -29,7 +29,7 @@ SRC_URI += " \ | |||
29 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 29 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
30 | " | 30 | " |
31 | 31 | ||
32 | SRCREV_qtlocation = "730b2bd96e88fe63364c9f81e299555f0b1f0daa" | 32 | SRCREV_qtlocation = "844e0e4aec3285ec5cfde90422acd796bc4d7d39" |
33 | SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" | 33 | SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" |
34 | 34 | ||
35 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 35 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 89055eae..12ac0840 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -35,4 +35,4 @@ SRC_URI += "\ | |||
35 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 35 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
36 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 36 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
37 | 37 | ||
38 | SRCREV = "9caee039533168fbb546b563859770414e54fc94" | 38 | SRCREV = "c8bf0cd37c5f526e3687dfeff9e23d15104328b5" |
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 deleted file mode 100644 index 2e644803..00000000 --- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From 3248edbde8859f62f453215876fbcb89dd788513 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Dmytriyenko <denys@ti.com> | ||
3 | Date: Thu, 31 Mar 2016 19:57:01 -0400 | ||
4 | Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
9 | --- | ||
10 | examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | ||
14 | index 69da88f0..9039191e 100644 | ||
15 | --- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | ||
16 | +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | ||
17 | @@ -54,6 +54,7 @@ | ||
18 | #include <QtGui/QTextCursor> | ||
19 | #include <QtGui/QFontDatabase> | ||
20 | #include <QtCore/QFileInfo> | ||
21 | +#include <QtCore/QDebug> | ||
22 | |||
23 | DocumentHandler::DocumentHandler() | ||
24 | : m_target(0) | ||
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 6bcca7a6..1f3ea9ca 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 = "4a077f719dff799a89b5f370dfc71a7bd14b0930" | 13 | SRCREV = "31a655402ff194e556853e6877f1a464a8e51243" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 46ec8503..8db84f74 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -20,10 +20,4 @@ FILES_${PN}-qmlplugins += " \ | |||
20 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 20 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
21 | " | 21 | " |
22 | 22 | ||
23 | # Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9 | 23 | SRCREV = "4397b10d7fee0e1183141942fde8af2d0382794d" |
24 | # 5.9.meta-qt5.2 | ||
25 | SRC_URI += " \ | ||
26 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | ||
27 | " | ||
28 | |||
29 | SRCREV = "37592ad9c6df35bdd37609569963fe7361cdad85" | ||
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 92979b78..c4298148 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
24 | 24 | ||
25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
26 | 26 | ||
27 | SRCREV = "170aa77ff7a38ba2ddbc68f75c1ac38a47af87ea" | 27 | SRCREV = "286f3c626087635cb24708b8e42b1d8af0401640" |
28 | 28 | ||
29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 3a2c7f8e..20ae28f8 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -30,4 +30,4 @@ DEPENDS += "qtbase" | |||
30 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 30 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
31 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 31 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
32 | 32 | ||
33 | SRCREV = "c904f06f716585edd94dbd1b4271dcbf305c268a" | 33 | SRCREV = "ef6c88d329386ece5b4a92d6a0865d7b90e036c0" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 00ec97bd..726127bb 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "50aea4ada4521f009ea8524b91daea1fac283c41" | 14 | SRCREV = "8ff62bd9536b5539e1e6b393c4ec87b092e36621" |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 761ab49b..eb89e71a 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -111,4 +111,4 @@ FILES_${PN}-qt = " \ | |||
111 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 111 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
112 | " | 112 | " |
113 | 113 | ||
114 | SRCREV = "6987cf9681dfb6c212a3225a8669499d3dfe1871" | 114 | SRCREV = "b3684346bd60983cecf2524f9f8081df514b5cb0" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 0f50caec..d5d2dee6 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
53 | 53 | ||
54 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" | 54 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" |
55 | 55 | ||
56 | SRCREV = "6ecb881bdc73a4ab1f4485e14bb87c18aac771ca" | 56 | SRCREV = "a15a5af71c1ff0e92a51a856391b546ca9fc23b8" |
diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch deleted file mode 100644 index 11acd5fd..00000000 --- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From c4fae91b3d2b2b0f64e3fafac456a6a917c69e88 Mon Sep 17 00:00:00 2001 | ||
2 | From: Raphael Freudiger <laser_b@gmx.ch> | ||
3 | Date: Tue, 10 Jan 2017 15:49:55 +0100 | ||
4 | Subject: [PATCH] fix build without xkbcommon-evdev | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Change-Id: I4f52c4ad741fdd7063a18b67f5777b52f03726fe | ||
10 | Signed-off-by: Raphael Freudiger <laser_b@gmx.ch> | ||
11 | Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> | ||
12 | --- | ||
13 | src/client/client.pro | 2 ++ | ||
14 | src/compositor/compositor.pro | 2 ++ | ||
15 | src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------ | ||
16 | 3 files changed, 11 insertions(+), 6 deletions(-) | ||
17 | |||
18 | diff --git a/src/client/client.pro b/src/client/client.pro | ||
19 | index eae7ad52..0bb7b188 100644 | ||
20 | --- a/src/client/client.pro | ||
21 | +++ b/src/client/client.pro | ||
22 | @@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \ | ||
23 | wayland-decoration-client \ | ||
24 | wayland-shell-integration | ||
25 | load(qt_module) | ||
26 | + | ||
27 | +LIBS += -lxkbcommon | ||
28 | diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro | ||
29 | index dc9000d9..4eebfd64 100644 | ||
30 | --- a/src/compositor/compositor.pro | ||
31 | +++ b/src/compositor/compositor.pro | ||
32 | @@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) | ||
33 | MODULE_PLUGIN_TYPES = \ | ||
34 | wayland-graphics-integration-server | ||
35 | load(qt_module) | ||
36 | + | ||
37 | +LIBS += -lxkbcommon | ||
38 | diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp | ||
39 | index c30f7b18..e6f1a0b3 100644 | ||
40 | --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp | ||
41 | +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp | ||
42 | @@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) | ||
43 | xkb_state = xkb_state_new(keymap); | ||
44 | } | ||
45 | |||
46 | -uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) | ||
47 | -{ | ||
48 | - const uint offset = 8; | ||
49 | - Q_ASSERT(nativeScanCode >= offset); | ||
50 | - return nativeScanCode - offset; | ||
51 | -} | ||
52 | |||
53 | void QWaylandKeyboardPrivate::createXKBKeymap() | ||
54 | { | ||
55 | @@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() | ||
56 | } | ||
57 | #endif | ||
58 | |||
59 | +uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) | ||
60 | +{ | ||
61 | + const uint offset = 8; | ||
62 | + Q_ASSERT(nativeScanCode >= offset); | ||
63 | + return nativeScanCode - offset; | ||
64 | +} | ||
65 | + | ||
66 | void QWaylandKeyboardPrivate::sendRepeatInfo() | ||
67 | { | ||
68 | Q_FOREACH (Resource *resource, resourceMap()) { | ||
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index ad7ad10d..656cc5aa 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -37,14 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature | |||
37 | 37 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "6bd70687aa32d1ad6fedc7cfad499fdaf037193e" | 40 | SRCREV = "154bdf45dd51a521058c820e7b871008ce8508ae" |
41 | |||
42 | # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 | ||
43 | # 5.9.meta-qt5.2 | ||
44 | # From https://bugreports.qt.io/browse/QTBUG-57767 | ||
45 | SRC_URI += " \ | ||
46 | file://0001-fix-build-without-xkbcommon-evdev.patch \ | ||
47 | " | ||
48 | 41 | ||
49 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
50 | 43 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index be915fcd..f256b0d4 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -162,8 +162,8 @@ SRC_URI_append_libc-musl = "\ | |||
162 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 162 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
163 | " | 163 | " |
164 | 164 | ||
165 | SRCREV_qtwebengine = "d4b3d9457bbe090c4ecc0d5a7d70e7bb08b22b90" | 165 | SRCREV_qtwebengine = "6f242a9389369242b23a61dcb59fc610dc27bb05" |
166 | SRCREV_chromium = "a83d8cdb8d8361eadb86ac48d020486f56543114" | 166 | SRCREV_chromium = "2ee59e45bd9c26ab26ac221696367584020b00ed" |
167 | SRCREV = "${SRCREV_qtwebengine}" | 167 | SRCREV = "${SRCREV_qtwebengine}" |
168 | 168 | ||
169 | SRCREV_FORMAT = "qtwebengine_chromium" | 169 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index cc2d7072..a7ccc1f2 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
21 | 21 | ||
22 | SRCREV = "4d4b118c1294d96741d71a775ac1c57b5acb96bb" | 22 | SRCREV = "a14f37e76b429876015ee96cc4adb97ed4c9fbed" |