summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-03-18 15:02:05 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2019-04-03 14:10:43 +0000
commit28d4bfdf74ba9d66ad749fc7208ca8dc147a3927 (patch)
tree0c1860045e9ca308bab1b30ab163bca0df4fcb2c
parent5a328383122c7d82b096b1b090a850e14d6fa311 (diff)
downloadmeta-qt5-28d4bfdf74ba9d66ad749fc7208ca8dc147a3927.tar.gz
Upgrade to 5.12.2
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb6
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch14
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb6
-rw-r--r--recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch28
-rw-r--r--recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch59
-rw-r--r--recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch28
-rw-r--r--recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch48
-rw-r--r--recipes-qt/qt5/qtbase_git.bb11
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtknx_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmqtt_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtopcua_git.bb9
-rw-r--r--recipes-qt/qt5/qtpurchasing_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch235
-rw-r--r--recipes-qt/qt5/qtscript_git.bb3
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch560
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb20
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch31
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb5
-rw-r--r--recipes-qt/qt5/qtwebglplugin_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
49 files changed, 58 insertions, 1073 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index f4d60bc7..eedb01e4 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -42,10 +42,6 @@ SRC_URI += "\
42 file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 42 file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
43 file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ 43 file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \
44 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 44 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
45 file://0018-Fix-compile-issue-with-gcc-9.patch \
46 file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \
47 file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \
48 file://0023-build-failure-with-clang.patch \
49" 45"
50 46
51# common for qtbase-native and nativesdk-qtbase 47# common for qtbase-native and nativesdk-qtbase
@@ -197,4 +193,4 @@ fakeroot do_generate_qt_environment_file() {
197do_generate_qt_environment_file[umask] = "022" 193do_generate_qt_environment_file[umask] = "022"
198addtask generate_qt_environment_file after do_install before do_package 194addtask generate_qt_environment_file after do_install before do_package
199 195
200SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" 196SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10"
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index 144c9a78..901a47fd 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,25 +1,27 @@
1From d3053e33c76cdb41eeeec3c853fa88c7c7bfb8a5 Mon Sep 17 00:00:00 2001 1From ee6c6dc4183234a6f092d9e5b8d05eaab8ee5382 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 17 Aug 2018 13:23:58 +0300 3Date: Fri, 17 Aug 2018 13:23:58 +0300
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
5 5
6--- 6---
7 qt3d.pro | 7 ++++++- 7 qt3d.pro | 9 +++++++--
8 src/3rdparty/assimp/assimp_dependency.pri | 2 +- 8 src/3rdparty/assimp/assimp_dependency.pri | 2 +-
9 tools/tools.pro | 2 +- 9 tools/tools.pro | 2 +-
10 3 files changed, 8 insertions(+), 3 deletions(-) 10 3 files changed, 9 insertions(+), 4 deletions(-)
11 11
12diff --git a/qt3d.pro b/qt3d.pro 12diff --git a/qt3d.pro b/qt3d.pro
13index 3fc7d1452..7311eff5b 100644 13index 847507f17..286286dd0 100644
14--- a/qt3d.pro 14--- a/qt3d.pro
15+++ b/qt3d.pro 15+++ b/qt3d.pro
16@@ -1,4 +1,4 @@ 16@@ -1,5 +1,5 @@
17-requires(qtHaveModule(gui))
17-requires(qtConfig(opengl):!wasm) 18-requires(qtConfig(opengl):!wasm)
19+!tools-only:requires(qtHaveModule(gui))
18+!tools-only:requires(qtConfig(opengl):!wasm) 20+!tools-only:requires(qtConfig(opengl):!wasm)
19 21
20 CONFIG += examples_need_tools 22 CONFIG += examples_need_tools
21 load(qt_parts) 23 load(qt_parts)
22@@ -14,3 +14,8 @@ load(qt_parts) 24@@ -15,3 +15,8 @@ load(qt_parts)
23 25
24 OTHER_FILES += \ 26 OTHER_FILES += \
25 sync.profile 27 sync.profile
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index a5588840..a3b62f8d 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
36 ${S}/src/quick3d/imports/input/importsinput.pro 36 ${S}/src/quick3d/imports/input/importsinput.pro
37} 37}
38 38
39SRCREV = "338addb5a79c32d5b7b3013746c6d5250e1581fe" 39SRCREV = "3de900a10c6fd051ba54727be2fd1fe47ed10481"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index c92da467..5ff5ccf5 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.12.0+git${SRCPV}" 17PV = "5.12.2+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 51cc6c4a..45b8f7b1 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -37,10 +37,6 @@ SRC_URI += "\
37 file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 37 file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
38 file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ 38 file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \
39 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 39 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
40 file://0018-Fix-compile-issue-with-gcc-9.patch \
41 file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \
42 file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \
43 file://0023-build-failure-with-clang.patch \
44" 40"
45 41
46# common for qtbase-native and nativesdk-qtbase 42# common for qtbase-native and nativesdk-qtbase
@@ -143,4 +139,4 @@ do_install() {
143 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 139 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
144} 140}
145 141
146SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" 142SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10"
diff --git a/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch
deleted file mode 100644
index e5e9813b..00000000
--- a/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 4bc9f80bb0875648a2f3eca5b14e4e9e56cfda4d Mon Sep 17 00:00:00 2001
2From: Allan Sandfeld Jensen <allan.jensen@qt.io>
3Date: Tue, 13 Nov 2018 16:00:23 +0100
4Subject: [PATCH] Fix compile issue with gcc 9
5
6It appears messenne_twisters in the latest libstdc++ has one more
7requirement before it is willing to construct with our
8SystemGenerator struct as an sseq provider.
9
10Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe
11Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13---
14 src/corelib/global/qrandom.cpp | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
18index 23e5e499b2..03534cf453 100644
19--- a/src/corelib/global/qrandom.cpp
20+++ b/src/corelib/global/qrandom.cpp
21@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator
22 #endif // Q_OS_WINRT
23
24 static SystemGenerator &self();
25+ typedef quint32 result_type;
26 void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept);
27
28 // For std::mersenne_twister_engine implementations that use something
diff --git a/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch b/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch
deleted file mode 100644
index 21e3207d..00000000
--- a/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From 4bcd7b1c6e06cfaef1a52795df007f1a9372eeed Mon Sep 17 00:00:00 2001
2From: Ville Voutilainen <ville.voutilainen@qt.io>
3Date: Wed, 21 Nov 2018 14:07:18 +0200
4Subject: [PATCH] Fix compilation of qendian's qswap specializations on gcc 4.8
5
6Task-number: QTBUG-71945
7Change-Id: Icf2b75c72946f57ebffc880c9238531dea13ab5b
8Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
9Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
10---
11 src/corelib/global/qendian.h | 12 ++++++------
12 1 file changed, 6 insertions(+), 6 deletions(-)
13
14diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
15index 0e67a1ab8e..f2e5833468 100644
16--- a/src/corelib/global/qendian.h
17+++ b/src/corelib/global/qendian.h
18@@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source)
19 return qFromUnaligned<Float>(&temp);
20 }
21
22-template <> inline qfloat16 qbswap<qfloat16>(qfloat16 source)
23+inline qfloat16 qbswap(qfloat16 source)
24 {
25 return qbswapFloatHelper(source);
26 }
27
28-template <> inline float qbswap<float>(float source)
29+inline float qbswap(float source)
30 {
31 return qbswapFloatHelper(source);
32 }
33
34-template <> inline double qbswap<double>(double source)
35+inline double qbswap(double source)
36 {
37 return qbswapFloatHelper(source);
38 }
39@@ -185,7 +185,7 @@ template <> inline double qbswap<double>(double source)
40 */
41 template <typename T> inline void qbswap(const T src, void *dest)
42 {
43- qToUnaligned<T>(qbswap<T>(src), dest);
44+ qToUnaligned<T>(qbswap(src), dest);
45 }
46
47 template <int Size> void *qbswap(const void *source, qsizetype count, void *dest) noexcept;
48@@ -223,9 +223,9 @@ template <typename T> inline void qFromLittleEndian(const void *source, qsizetyp
49 #else // Q_LITTLE_ENDIAN
50
51 template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source)
52-{ return qbswap<T>(source); }
53+{ return qbswap(source); }
54 template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source)
55-{ return qbswap<T>(source); }
56+{ return qbswap(source); }
57 template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source)
58 { return source; }
59 template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source)
diff --git a/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch b/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch
deleted file mode 100644
index 4169fb76..00000000
--- a/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From c94a6510ae983e46f60e0cfb1b0f20229c990d93 Mon Sep 17 00:00:00 2001
2From: Ville Voutilainen <ville.voutilainen@qt.io>
3Date: Fri, 4 Jan 2019 09:35:40 +0200
4Subject: [PATCH] Fix qbswap calls for Big Endian targets
5
6Upstream-Status: Backport
7Task-number: QTBUG-71945
8Change-Id: I5356f8e32d00ea591b1f65cdd4111276fcf876ac
9---
10 src/corelib/global/qendian.h | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
14index f2e5833468..615f523888 100644
15--- a/src/corelib/global/qendian.h
16+++ b/src/corelib/global/qendian.h
17@@ -204,9 +204,9 @@ template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source)
18 template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source)
19 { return source; }
20 template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source)
21-{ return qbswap<T>(source); }
22+{ return qbswap(source); }
23 template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source)
24-{ return qbswap<T>(source); }
25+{ return qbswap(source); }
26 template <typename T> inline void qToBigEndian(T src, void *dest)
27 { qToUnaligned<T>(src, dest); }
28 template <typename T> inline void qToLittleEndian(T src, void *dest)
diff --git a/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch b/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch
deleted file mode 100644
index 0576a22c..00000000
--- a/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From f958dccc8c7c777aaca1f110ed48c71b28fdea92 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 1 Mar 2019 15:11:19 -0800
4Subject: [PATCH] Fix build failure with clang
5
6Complement below commit
7
8commit 1555894dec537cbc422f43fe959b0d0ee0000881
9Author: Thiago Macieira <thiago.macieira@intel.com>
10Date: Wed Jul 25 19:04:20 2018 -0700
11
12 QCborValue: Disable support for spaceship operator
13
14 __has_include(<compare>) is not the correct way to detect this feature,
15 since that's a library header and may be provided by an implementation
16 (libc++) before the compiler supports the syntax.
17
18 Change-Id: I80aae0d068974d83b6c0fffd1544c8e558e2446b
19 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
20
21Fixes
22tst_qcborvalue.cpp:336:17: error: invalid operands to binary expression ('QCborValue' and 'QCborValue')
23 QVERIFY(!(v > other));
24 ~ ^ ~~~~~
25
26Upstream-Status: Pending
27
28Signed-off-by: Khem Raj <raj.khem@gmail.com>
29---
30 tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | 2 +-
31 1 file changed, 1 insertion(+), 1 deletion(-)
32
33diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
34index 38b26e7de4..4b753eab6b 100644
35--- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
36+++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
37@@ -330,7 +330,7 @@ void tst_QCborValue::copyCompare()
38 QCOMPARE(v, other);
39 QVERIFY(!(v != other));
40 QVERIFY(!(v < other));
41-#if QT_HAS_INCLUDE(<compare>)
42+#if 0 && QT_HAS_INCLUDE(<compare>)
43 QVERIFY(v <= other);
44 QVERIFY(v >= other);
45 QVERIFY(!(v > other));
46--
472.21.0
48
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 821eb95c..c023e4fc 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -33,13 +33,8 @@ SRC_URI += "\
33 file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 33 file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
34 file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ 34 file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \
35 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 35 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
36 file://0018-Fix-compile-issue-with-gcc-9.patch \
37 file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \
38 file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \
39 file://0023-build-failure-with-clang.patch \
40" 36"
41 37
42
43# for syncqt 38# for syncqt
44RDEPENDS_${PN}-tools += "perl" 39RDEPENDS_${PN}-tools += "perl"
45 40
@@ -68,7 +63,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f
68# separate some parts of PACKAGECONFIG which are often changed 63# separate some parts of PACKAGECONFIG which are often changed
69PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 64PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
70PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 65PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
71PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon-evdev', '', d)}" 66PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon', '', d)}"
72PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite accessibility openssl', '', d)}" 67PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite accessibility openssl', '', d)}"
73PACKAGECONFIG_FONTS ?= "" 68PACKAGECONFIG_FONTS ?= ""
74PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" 69PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
@@ -144,7 +139,7 @@ PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3"
144PACKAGECONFIG[xcb-xinput] = "-xcb-xinput,-no-xcb-xinput,libxcb" 139PACKAGECONFIG[xcb-xinput] = "-xcb-xinput,-no-xcb-xinput,libxcb"
145PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" 140PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv"
146PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" 141PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon"
147PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config" 142PACKAGECONFIG[xkbcommon] = "-xkbcommon,-no-xkbcommon,libxkbcommon,xkeyboard-config"
148PACKAGECONFIG[evdev] = "-evdev,-no-evdev" 143PACKAGECONFIG[evdev] = "-evdev,-no-evdev"
149PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" 144PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev"
150# depends on glib 145# depends on glib
@@ -294,4 +289,4 @@ sed -i \
294 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 289 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
295} 290}
296 291
297SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" 292SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index b11e355f..f92db8bb 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS = "qtdeclarative" 12DEPENDS = "qtdeclarative"
13 13
14SRCREV = "f0552b1eb14568fa6802191d13a1123effdbb636" 14SRCREV = "f9b7e894b3d91bf760d71d7d784e2d162da0569e"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index db91b59f..d69124bc 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "b36af85eac67c2e92b35849b34d913ee0290cd2b" 11SRCREV = "c9bc2672b513a414708026f4271d247feaa26471"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 4d98b95a..2d9298db 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
21 21
22EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 22EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
23 23
24SRCREV = "e9967647ffe20df0473a1fa9eb10957b4e32fbf3" 24SRCREV = "eec8fed760a572eb9187f79b43d87986f2b4f404"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 140be8a1..7e7237bd 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "20f42d4c87162992fc2322e65aee1a1e2b1f28a2" 11SRCREV = "428195cb2b1dc0c48eb348abb856cdaabf79dc0d"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 56a98eaa..3cac4441 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -24,6 +24,6 @@ do_install_append_class-nativesdk() {
24 rm -rf ${D}${OE_QMAKE_PATH_QML} 24 rm -rf ${D}${OE_QMAKE_PATH_QML}
25} 25}
26 26
27SRCREV = "c401ae278b4bb91c70c6d7df974a241d7c68855b" 27SRCREV = "cd7ce85ff0b8f9a5163c7dc276dc7751c3f51f0f"
28 28
29BBCLASSEXTEND =+ "native nativesdk" 29BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index b9b7c1cf..70ac2cbe 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14 14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "2d532f3d84654e75273af4a5a34310413555e00f" 17SRCREV = "744e13b37bf1061814d7e2e1d60f8e3ce4ac6e0b"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 75056d98..599f5ce9 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "5b24291329cdbd19b795b4c3d8aafc4ffd916a2d" 21SRCREV = "41ab3587cf0847e3442da6d14253e4bec4e87837"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index f466b75d..0d75655d 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "178b8572d71a34975ffd7ada87227e1b8ed7296e" 28SRCREV = "1b8478f86f15dc1dd125a2a0d8331bc3600a79c1"
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb
index 94a991dc..52882aad 100644
--- a/recipes-qt/qt5/qtknx_git.bb
+++ b/recipes-qt/qt5/qtknx_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "3c6e84d7b39014d5df6750f096bc31a5b24e164b" 12SRCREV = "e807632b21caefa1ed6ebf1b626d8f5c596c2952"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 88dfa67c..8cac62ef 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -31,7 +31,7 @@ SRC_URI += " \
31 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 31 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
32" 32"
33 33
34SRCREV_qtlocation = "a4442abdc034de7984e003c821939ce1b1976593" 34SRCREV_qtlocation = "a00c5e40a2df03713d29da83a5692f2d7c15326d"
35SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" 35SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
36 36
37SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 37SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index 6f05ac37..71f895ce 100644
--- a/recipes-qt/qt5/qtmqtt_git.bb
+++ b/recipes-qt/qt5/qtmqtt_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "bf30507ef17445b464abe230f4bf349d732fbfd1" 12SRCREV = "a4d673f9a75c7dbbcedcaa076542a71acc832fc4"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 11de21f9..469529d1 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -37,4 +37,4 @@ SRC_URI += "\
37# http://errors.yoctoproject.org/Errors/Build/44914/ 37# http://errors.yoctoproject.org/Errors/Build/44914/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "7b0b5bb0b9e15ad54b061ee39712ce86235535d5" 40SRCREV = "9caf4812e073829fc961eb466f1325106f041841"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 258fe10e..477258d6 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "71318ed079ddf7c0c3af9d70f64b9519e23b7499" 12SRCREV = "bd9c083ba099a46d101ca64369f46ba7fba2a943"
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index b99c485b..754da541 100644
--- a/recipes-qt/qt5/qtopcua_git.bb
+++ b/recipes-qt/qt5/qtopcua_git.bb
@@ -8,6 +8,11 @@ LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ 8 file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
9" 9"
10 10
11DEPENDS += "qtbase" 11# src/3rdparty/open62541.pri adds -Wno-format, causing following error
12# because -Wformat-security cannot be used together with -Wno-format
13# cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]
14SECURITY_STRINGFORMAT = ""
12 15
13SRCREV = "fd6f1d80aa501d8d003018359ce9c023e70732d5" 16DEPENDS += "qtbase qtdeclarative"
17
18SRCREV = "72c2ee600f214fccc147a9fb3809087e7064b56b"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index b5863bf5..2cf778c3 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtbase qtdeclarative" 11DEPENDS += "qtbase qtdeclarative"
12 12
13SRCREV = "2de8d672b596c6a67afc2a72a293a08d0a3912d8" 13SRCREV = "2234141c0ec838dd537bec909c87e8a184125f68"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 6969c6ee..5d18f977 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative qtdeclarative-native" 11DEPENDS += "qtdeclarative qtdeclarative-native"
12 12
13SRCREV = "69f02184a9a71f3a5e2dd1ada12367ddccd29787" 13SRCREV = "ca799283a2266b023923286b4928fdf6e7211569"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 62efef89..d4ea6186 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
18" 18"
19 19
20SRCREV = "5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb" 20SRCREV = "c231395eec3494619f4977b4c5cd845b9d7341ae"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 0b177de1..ff934bde 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
25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
26 26
27SRCREV = "5bc5f04be23237f9d55b2134ae55bd93bed342a0" 27SRCREV = "1c19349a28a75eec386b84af142fc571e492a3c3"
28 28
29BBCLASSEXTEND += "native nativesdk" 29BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch b/recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch
deleted file mode 100644
index 629cf8e8..00000000
--- a/recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch
+++ /dev/null
@@ -1,235 +0,0 @@
1From 03cdaf779e0d8587c6e110f1f834a15e2d3317fd Mon Sep 17 00:00:00 2001
2From: Thiago Macieira <thiago.macieira@intel.com>
3Date: Mon, 28 Jan 2019 14:33:12 -0800
4Subject: [PATCH] Fix build with GCC 8.3
5
6Qualifiers in the asm statement are not allowed in the global scope. I
7thought they were necessary for LTO, but I the commit to this file that
8added them predates my work on setting up LTO for GCC.
9
10Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49
11Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
12---
13 .../JavaScriptCore/jit/JITStubs.cpp | 48 +++++++++----------
14 1 file changed, 24 insertions(+), 24 deletions(-)
15
16diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
17index 1abdf8b..9f60761 100644
18--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
19+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
20@@ -116,7 +116,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, JITStackFrame_s
21 COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
22 COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline);
23
24-asm volatile (
25+asm (
26 ".text\n"
27 ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
28 HIDE_SYMBOL(ctiTrampoline) "\n"
29@@ -138,7 +138,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
30 "ret" "\n"
31 );
32
33-asm volatile (
34+asm (
35 ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
36 HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
37 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
38@@ -154,7 +154,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
39 "ret" "\n"
40 );
41
42-asm volatile (
43+asm (
44 ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
45 HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
46 SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
47@@ -179,7 +179,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_s
48 COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
49 COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline);
50
51-asm volatile (
52+asm (
53 ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
54 HIDE_SYMBOL(ctiTrampoline) "\n"
55 SYMBOL_STRING(ctiTrampoline) ":" "\n"
56@@ -206,7 +206,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
57 "ret" "\n"
58 );
59
60-asm volatile (
61+asm (
62 ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
63 HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
64 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
65@@ -222,7 +222,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
66 "ret" "\n"
67 );
68
69-asm volatile (
70+asm (
71 ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
72 HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
73 SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
74@@ -242,7 +242,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
75 #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7."
76 #endif
77
78-asm volatile (
79+asm (
80 ".text" "\n"
81 ".align 2" "\n"
82 ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
83@@ -269,7 +269,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
84 "bx lr" "\n"
85 );
86
87-asm volatile (
88+asm (
89 ".text" "\n"
90 ".align 2" "\n"
91 ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
92@@ -287,7 +287,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
93 "bx lr" "\n"
94 );
95
96-asm volatile (
97+asm (
98 ".text" "\n"
99 ".align 2" "\n"
100 ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
101@@ -305,7 +305,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
102
103 #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL)
104
105-asm volatile (
106+asm (
107 ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
108 HIDE_SYMBOL(ctiTrampoline) "\n"
109 SYMBOL_STRING(ctiTrampoline) ":" "\n"
110@@ -323,7 +323,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
111 "mov pc, lr" "\n"
112 );
113
114-asm volatile (
115+asm (
116 ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
117 HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
118 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
119@@ -418,7 +418,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_
120 COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline);
121 COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
122
123-asm volatile (
124+asm (
125 ".text\n"
126 ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
127 HIDE_SYMBOL(ctiTrampoline) "\n"
128@@ -440,7 +440,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
129 "ret" "\n"
130 );
131
132-asm volatile (
133+asm (
134 ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
135 HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
136 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
137@@ -456,7 +456,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
138 "ret" "\n"
139 );
140
141-asm volatile (
142+asm (
143 ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
144 HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
145 SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
146@@ -480,7 +480,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_
147 COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x48, JITStackFrame_code_offset_matches_ctiTrampoline);
148 COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x78, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
149
150-asm volatile (
151+asm (
152 ".text\n"
153 ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
154 HIDE_SYMBOL(ctiTrampoline) "\n"
155@@ -515,7 +515,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
156 "ret" "\n"
157 );
158
159-asm volatile (
160+asm (
161 ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
162 HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
163 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
164@@ -531,7 +531,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
165 "ret" "\n"
166 );
167
168-asm volatile (
169+asm (
170 ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
171 HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
172 SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
173@@ -551,7 +551,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
174 #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7."
175 #endif
176
177-asm volatile (
178+asm (
179 ".text" "\n"
180 ".align 2" "\n"
181 ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
182@@ -578,7 +578,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
183 "bx lr" "\n"
184 );
185
186-asm volatile (
187+asm (
188 ".text" "\n"
189 ".align 2" "\n"
190 ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
191@@ -596,7 +596,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
192 "bx lr" "\n"
193 );
194
195-asm volatile (
196+asm (
197 ".text" "\n"
198 ".align 2" "\n"
199 ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
200@@ -614,7 +614,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
201
202 #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL)
203
204-asm volatile (
205+asm (
206 ".text\n"
207 ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
208 HIDE_SYMBOL(ctiTrampoline) "\n"
209@@ -632,7 +632,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
210 "mov pc, lr" "\n"
211 );
212
213-asm volatile (
214+asm (
215 ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
216 HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
217 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
218@@ -1024,7 +1024,7 @@ static NEVER_INLINE void throwStackOverflowError(CallFrame* callFrame, JSGlobalD
219 extern "C" { \
220 rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \
221 }; \
222- asm volatile ( \
223+ asm ( \
224 ".text" "\n" \
225 ".align 2" "\n" \
226 ".globl " SYMBOL_STRING(cti_##op) "\n" \
227@@ -1053,7 +1053,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, thunkReturnAddress) == THUNK_RETUR
228 extern "C" { \
229 rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \
230 }; \
231- asm volatile ( \
232+ asm ( \
233 ".globl " SYMBOL_STRING(cti_##op) "\n" \
234 HIDE_SYMBOL(cti_##op) "\n" \
235 SYMBOL_STRING(cti_##op) ":" "\n" \
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index a6b6429c..67d17b28 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = " \
15# 5.12.meta-qt5.2 15# 5.12.meta-qt5.2
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ 17 file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \
18 file://0002-Fix-build-with-GCC-8.3.patch \
19" 18"
20 19
21# qemuarm build fails with: 20# qemuarm build fails with:
@@ -37,4 +36,4 @@ DEPENDS += "qtbase"
37# http://errors.yoctoproject.org/Errors/Build/44915/ 36# http://errors.yoctoproject.org/Errors/Build/44915/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 38
40SRCREV = "0be84da60090e9d20ec0066bcd3900ca5572df95" 39SRCREV = "6c0edaf30c5bdfc2739ca646da73dcb697ab1361"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 2eab9126..91b2cde2 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "1043e8abd566aa92f63acedbe188a51e83b9555c" 13SRCREV = "4bb7aa3f3002b9ba85494e5cf4808f68e0edc502"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12
16# 5.12.meta-qt5.1 16# 5.12.meta-qt5.1
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 473dee59..7ef368cf 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "36d12d57b0b291b660b2bdb9e1b3ae855e2fc4c0" 15SRCREV = "73d5160ab8219015a25e59c62669b2926156b807"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 054f5bc8..3345f7df 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "ce265ff81223bf7a5978e66dba59fb4b10469b9e" 14SRCREV = "745120ddca5fa67f1a87741e0a5c016acbd53deb"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 1b7eb3cd..1f05b6c6 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "a15a7f1362454a575a4420cdd89498f42055fe48" 15SRCREV = "624f175492660301af5eb321d2b8d6af7aa7fbc3"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index f663e31d..bb62e2e8 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "aa7431fdabc0434bc30ae8af0753be8c1cb9b576" 15SRCREV = "2430c9ed20f3f10da7bc3e7fdb5328d8501f5776"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 0bda2e99..05741de7 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -31,4 +31,4 @@ do_install_append() {
31 31
32QT_MODULE_BRANCH = "dev" 32QT_MODULE_BRANCH = "dev"
33 33
34SRCREV = "66e45676f5f5c6251ccab36906c6324fd0065e08" 34SRCREV = "e3332ee38d27a134cef6621fdaf36687af1b6f4a"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 325535ad..be967149 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \
32 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ 32 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
33" 33"
34 34
35SRCREV = "4e823c69ec36b648d6126ae5ec031f58d1372ab4" 35SRCREV = "b0147a5d79ce7a7e77a24f36aaddfacb1a1517c8"
36 36
37BBCLASSEXTEND = "native nativesdk" 37BBCLASSEXTEND = "native nativesdk"
38 38
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index bb6f2ff2..4158fb00 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ 98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
99" 99"
100 100
101SRCREV = "074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a" 101SRCREV = "c8a0da51adcc015447fc26e5a2b3d1de12479f75"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 1ea12ee5..bd339428 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
49 49
50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
51 51
52SRCREV = "5aaf55adcf3742e05283274ce1b8c721c7da7c8d" 52SRCREV = "277aad92fb5d5612c2b952f05063518d877a5138"
diff --git a/recipes-qt/qt5/qtwayland/0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch b/recipes-qt/qt5/qtwayland/0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch
deleted file mode 100644
index 2938fb2e..00000000
--- a/recipes-qt/qt5/qtwayland/0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch
+++ /dev/null
@@ -1,560 +0,0 @@
1From 6a3be262635cff2811e6da6799c17980a0f67bef Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 22 Dec 2018 18:03:56 +0000
4Subject: [PATCH] Revert "use new feature name xkbcommon_evdev -> xkbcommon"
5
6This reverts commit a8fed20181729cae70de43079c4a34ad1780cfd7.
7
8To be compatible with qtbase 5.12.0, remove this patch when upgrading
9qtbase to 5.12.1
10---
11 README | 4 ++--
12 src/client/client.pro | 4 ++--
13 src/client/qwaylandinputdevice.cpp | 22 +++++++++----------
14 src/client/qwaylandinputdevice_p.h | 10 ++++-----
15 .../compositor_api/qwaylandcompositor.cpp | 2 +-
16 .../compositor_api/qwaylandkeyboard.cpp | 22 +++++++++----------
17 .../compositor_api/qwaylandkeyboard_p.h | 8 +++----
18 .../wayland_wrapper/wayland_wrapper.pri | 4 ++--
19 .../shellintegration/ivi-shell/ivi-shell.pro | 4 ++--
20 .../shellintegration/wl-shell/wl-shell.pro | 4 ++--
21 .../xdg-shell-v5/xdg-shell-v5.pro | 4 ++--
22 .../xdg-shell-v6/xdg-shell-v6.pro | 4 ++--
23 .../shellintegration/xdg-shell/xdg-shell.pro | 4 ++--
24 src/shared/qwaylandxkb.cpp | 10 ++++-----
25 src/shared/qwaylandxkb_p.h | 2 +-
26 .../auto/compositor/compositor/compositor.pro | 4 ++--
27 .../compositor/compositor/tst_compositor.cpp | 6 ++---
28 17 files changed, 59 insertions(+), 59 deletions(-)
29
30diff --git a/README b/README
31index bc6569ef..4fd99495 100644
32--- a/README
33+++ b/README
34@@ -9,8 +9,8 @@ QtWaylandCompositor API:
35 Enables the creation of Wayland compositors using Qt and QtQuick.
36
37 To build the QtWayland module you need the external dependencies:
38-xkbcommon - http://xkbcommon.org/
39-wayland - http://wayland.freedesktop.org/
40+xkbcommon 0.2.0 - http://xkbcommon.org/
41+wayland 1.6.0 - http://wayland.freedesktop.org/
42
43 QtWaylandCompositor supports loading client buffer integrations that don't use
44 the wayland-egl interfaces. These client buffer integrations are picked up by
45diff --git a/src/client/client.pro b/src/client/client.pro
46index 30f32dd7..45bbb976 100644
47--- a/src/client/client.pro
48+++ b/src/client/client.pro
49@@ -15,8 +15,8 @@ use_gold_linker: CONFIG += no_linker_version_script
50 CONFIG -= precompile_header
51 CONFIG += link_pkgconfig wayland-scanner
52
53-qtConfig(xkbcommon): \
54- QMAKE_USE_PRIVATE += xkbcommon
55+qtConfig(xkbcommon-evdev): \
56+ QMAKE_USE_PRIVATE += xkbcommon_evdev
57
58 QMAKE_USE += wayland-client
59
60diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
61index ba55e6e1..9d675ae2 100644
62--- a/src/client/qwaylandinputdevice.cpp
63+++ b/src/client/qwaylandinputdevice.cpp
64@@ -70,7 +70,7 @@
65
66 #include <QtGui/QGuiApplication>
67
68-#if QT_CONFIG(xkbcommon)
69+#if QT_CONFIG(xkbcommon_evdev)
70 #include <xkbcommon/xkbcommon-compose.h>
71 #endif
72
73@@ -84,7 +84,7 @@ QWaylandInputDevice::Keyboard::Keyboard(QWaylandInputDevice *p)
74 connect(&mRepeatTimer, SIGNAL(timeout()), this, SLOT(repeatKey()));
75 }
76
77-#if QT_CONFIG(xkbcommon)
78+#if QT_CONFIG(xkbcommon_evdev)
79 bool QWaylandInputDevice::Keyboard::createDefaultKeyMap()
80 {
81 if (mXkbContext && mXkbMap && mXkbState) {
82@@ -156,7 +156,7 @@ void QWaylandInputDevice::Keyboard::releaseComposeState()
83
84 QWaylandInputDevice::Keyboard::~Keyboard()
85 {
86-#if QT_CONFIG(xkbcommon)
87+#if QT_CONFIG(xkbcommon_evdev)
88 releaseComposeState();
89 releaseKeyMap();
90 #endif
91@@ -344,7 +344,7 @@ Qt::KeyboardModifiers QWaylandInputDevice::Keyboard::modifiers() const
92 {
93 Qt::KeyboardModifiers ret = Qt::NoModifier;
94
95-#if QT_CONFIG(xkbcommon)
96+#if QT_CONFIG(xkbcommon_evdev)
97 if (!mXkbState)
98 return ret;
99
100@@ -625,7 +625,7 @@ void QWaylandInputDevice::Pointer::pointer_axis(uint32_t time, uint32_t axis, in
101
102 void QWaylandInputDevice::Keyboard::keyboard_keymap(uint32_t format, int32_t fd, uint32_t size)
103 {
104-#if QT_CONFIG(xkbcommon)
105+#if QT_CONFIG(xkbcommon_evdev)
106 if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
107 close(fd);
108 return;
109@@ -728,7 +728,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time,
110 if (isDown)
111 mParent->mQDisplay->setLastInputDevice(mParent, serial, window);
112
113-#if QT_CONFIG(xkbcommon)
114+#if QT_CONFIG(xkbcommon_evdev)
115 if (!createDefaultKeyMap()) {
116 return;
117 }
118@@ -771,7 +771,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time,
119 #endif
120
121 if (state == WL_KEYBOARD_KEY_STATE_PRESSED
122-#if QT_CONFIG(xkbcommon)
123+#if QT_CONFIG(xkbcommon_evdev)
124 && xkb_keymap_key_repeats(mXkbMap, code)
125 #endif
126 ) {
127@@ -779,7 +779,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time,
128 mRepeatCode = code;
129 mRepeatTime = time;
130 mRepeatText = text;
131-#if QT_CONFIG(xkbcommon)
132+#if QT_CONFIG(xkbcommon_evdev)
133 mRepeatSym = sym;
134 #endif
135 mRepeatTimer.setInterval(400);
136@@ -793,7 +793,7 @@ void QWaylandInputDevice::Keyboard::repeatKey()
137 {
138 mRepeatTimer.setInterval(25);
139 sendKey(mFocus->window(), mRepeatTime, QEvent::KeyRelease, mRepeatKey, modifiers(), mRepeatCode,
140-#if QT_CONFIG(xkbcommon)
141+#if QT_CONFIG(xkbcommon_evdev)
142 mRepeatSym, mNativeModifiers,
143 #else
144 0, 0,
145@@ -801,7 +801,7 @@ void QWaylandInputDevice::Keyboard::repeatKey()
146 mRepeatText, true);
147
148 sendKey(mFocus->window(), mRepeatTime, QEvent::KeyPress, mRepeatKey, modifiers(), mRepeatCode,
149-#if QT_CONFIG(xkbcommon)
150+#if QT_CONFIG(xkbcommon_evdev)
151 mRepeatSym, mNativeModifiers,
152 #else
153 0, 0,
154@@ -816,7 +816,7 @@ void QWaylandInputDevice::Keyboard::keyboard_modifiers(uint32_t serial,
155 uint32_t group)
156 {
157 Q_UNUSED(serial);
158-#if QT_CONFIG(xkbcommon)
159+#if QT_CONFIG(xkbcommon_evdev)
160 if (mXkbState)
161 xkb_state_update_mask(mXkbState,
162 mods_depressed, mods_latched, mods_locked,
163diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
164index 7aa86539..4b12cc08 100644
165--- a/src/client/qwaylandinputdevice_p.h
166+++ b/src/client/qwaylandinputdevice_p.h
167@@ -65,7 +65,7 @@
168
169 #include <QtWaylandClient/private/qwayland-wayland.h>
170
171-#if QT_CONFIG(xkbcommon)
172+#if QT_CONFIG(xkbcommon_evdev)
173 #include <xkbcommon/xkbcommon.h>
174 #include <xkbcommon/xkbcommon-keysyms.h>
175 #endif
176@@ -77,7 +77,7 @@
177 struct wl_cursor_image;
178 #endif
179
180-#if QT_CONFIG(xkbcommon)
181+#if QT_CONFIG(xkbcommon_evdev)
182 struct xkb_compose_state;
183 struct xkb_compose_table;
184 #endif
185@@ -209,7 +209,7 @@ public:
186
187 QWaylandInputDevice *mParent = nullptr;
188 QPointer<QWaylandWindow> mFocus;
189-#if QT_CONFIG(xkbcommon)
190+#if QT_CONFIG(xkbcommon_evdev)
191 xkb_context *mXkbContext = nullptr;
192 xkb_keymap *mXkbMap = nullptr;
193 xkb_state *mXkbState = nullptr;
194@@ -222,7 +222,7 @@ public:
195 uint32_t mRepeatCode;
196 uint32_t mRepeatTime;
197 QString mRepeatText;
198-#if QT_CONFIG(xkbcommon)
199+#if QT_CONFIG(xkbcommon_evdev)
200 xkb_keysym_t mRepeatSym;
201 #endif
202 QTimer mRepeatTimer;
203@@ -233,7 +233,7 @@ private slots:
204 void repeatKey();
205
206 private:
207-#if QT_CONFIG(xkbcommon)
208+#if QT_CONFIG(xkbcommon_evdev)
209 bool createDefaultKeyMap();
210 void releaseKeyMap();
211 void createComposeState();
212diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
213index 173b50ce..c782304e 100644
214--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
215+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
216@@ -128,7 +128,7 @@ public:
217 uint32_t code = ke->nativeScanCode;
218 bool isDown = ke->keyType == QEvent::KeyPress;
219
220-#if QT_CONFIG(xkbcommon)
221+#if QT_CONFIG(xkbcommon_evdev)
222 QString text;
223 Qt::KeyboardModifiers modifiers = QWaylandXkb::modifiers(keyb->xkbState());
224
225diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
226index 68d855a6..e067eeaf 100644
227--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
228+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
229@@ -51,7 +51,7 @@
230
231 #include <fcntl.h>
232 #include <unistd.h>
233-#if QT_CONFIG(xkbcommon)
234+#if QT_CONFIG(xkbcommon_evdev)
235 #include <sys/mman.h>
236 #include <sys/types.h>
237 #include <qwaylandxkb_p.h>
238@@ -66,7 +66,7 @@ QWaylandKeyboardPrivate::QWaylandKeyboardPrivate(QWaylandSeat *seat)
239
240 QWaylandKeyboardPrivate::~QWaylandKeyboardPrivate()
241 {
242-#if QT_CONFIG(xkbcommon)
243+#if QT_CONFIG(xkbcommon_evdev)
244 if (xkb_context) {
245 if (keymap_area)
246 munmap(keymap_area, keymap_size);
247@@ -136,7 +136,7 @@ void QWaylandKeyboardPrivate::keyboard_bind_resource(wl_keyboard::Resource *reso
248 if (resource->version() >= WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION)
249 send_repeat_info(resource->handle, repeatRate, repeatDelay);
250
251-#if QT_CONFIG(xkbcommon)
252+#if QT_CONFIG(xkbcommon_evdev)
253 if (xkb_context) {
254 send_keymap(resource->handle, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
255 keymap_fd, keymap_size);
256@@ -164,7 +164,7 @@ void QWaylandKeyboardPrivate::keyboard_release(wl_keyboard::Resource *resource)
257
258 void QWaylandKeyboardPrivate::keyEvent(uint code, uint32_t state)
259 {
260-#if QT_CONFIG(xkbcommon)
261+#if QT_CONFIG(xkbcommon_evdev)
262 uint key = toWaylandXkbV1Key(code);
263 #else
264 uint key = code;
265@@ -180,7 +180,7 @@ void QWaylandKeyboardPrivate::sendKeyEvent(uint code, uint32_t state)
266 {
267 uint32_t time = compositor()->currentTimeMsecs();
268 uint32_t serial = compositor()->nextSerial();
269-#if QT_CONFIG(xkbcommon)
270+#if QT_CONFIG(xkbcommon_evdev)
271 uint key = toWaylandXkbV1Key(code);
272 #else
273 uint key = code;
274@@ -197,7 +197,7 @@ void QWaylandKeyboardPrivate::modifiers(uint32_t serial, uint32_t mods_depressed
275 }
276 }
277
278-#if QT_CONFIG(xkbcommon)
279+#if QT_CONFIG(xkbcommon_evdev)
280 void QWaylandKeyboardPrivate::maybeUpdateXkbScanCodeTable()
281 {
282 if (!scanCodesByQtKey.isEmpty() || !xkbState())
283@@ -225,7 +225,7 @@ void QWaylandKeyboardPrivate::maybeUpdateXkbScanCodeTable()
284
285 void QWaylandKeyboardPrivate::updateModifierState(uint code, uint32_t state)
286 {
287-#if QT_CONFIG(xkbcommon)
288+#if QT_CONFIG(xkbcommon_evdev)
289 if (!xkb_context)
290 return;
291
292@@ -265,7 +265,7 @@ void QWaylandKeyboardPrivate::maybeUpdateKeymap()
293 return;
294
295 pendingKeymap = false;
296-#if QT_CONFIG(xkbcommon)
297+#if QT_CONFIG(xkbcommon_evdev)
298 if (!xkb_context)
299 return;
300
301@@ -285,7 +285,7 @@ void QWaylandKeyboardPrivate::maybeUpdateKeymap()
302 #endif
303 }
304
305-#if QT_CONFIG(xkbcommon)
306+#if QT_CONFIG(xkbcommon_evdev)
307 static int createAnonymousFile(size_t size)
308 {
309 QString path = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
310@@ -429,7 +429,7 @@ QWaylandKeyboard::QWaylandKeyboard(QWaylandSeat *seat, QObject *parent)
311 connect(keymap, &QWaylandKeymap::optionsChanged, this, &QWaylandKeyboard::updateKeymap);
312 connect(keymap, &QWaylandKeymap::rulesChanged, this, &QWaylandKeyboard::updateKeymap);
313 connect(keymap, &QWaylandKeymap::modelChanged, this, &QWaylandKeyboard::updateKeymap);
314-#if QT_CONFIG(xkbcommon)
315+#if QT_CONFIG(xkbcommon_evdev)
316 d->initXKB();
317 #endif
318 }
319@@ -592,7 +592,7 @@ void QWaylandKeyboard::addClient(QWaylandClient *client, uint32_t id, uint32_t v
320 uint QWaylandKeyboard::keyToScanCode(int qtKey) const
321 {
322 uint scanCode = 0;
323-#if QT_CONFIG(xkbcommon)
324+#if QT_CONFIG(xkbcommon_evdev)
325 Q_D(const QWaylandKeyboard);
326 const_cast<QWaylandKeyboardPrivate *>(d)->maybeUpdateXkbScanCodeTable();
327 scanCode = d->scanCodesByQtKey.value({d->group, qtKey}, 0);
328diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h
329index 87e89e85..cd1f2795 100644
330--- a/src/compositor/compositor_api/qwaylandkeyboard_p.h
331+++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h
332@@ -62,7 +62,7 @@
333
334 #include <QtCore/QVector>
335
336-#if QT_CONFIG(xkbcommon)
337+#if QT_CONFIG(xkbcommon_evdev)
338 #include <xkbcommon/xkbcommon.h>
339 #endif
340
341@@ -86,7 +86,7 @@ public:
342 void modifiers(uint32_t serial, uint32_t mods_depressed,
343 uint32_t mods_latched, uint32_t mods_locked, uint32_t group);
344
345-#if QT_CONFIG(xkbcommon)
346+#if QT_CONFIG(xkbcommon_evdev)
347 struct xkb_state *xkbState() const { return xkb_state; }
348 uint32_t xkbModsMask() const { return modsDepressed | modsLatched | modsLocked; }
349 void maybeUpdateXkbScanCodeTable();
350@@ -106,7 +106,7 @@ protected:
351 void keyboard_release(Resource *resource) override;
352
353 private:
354-#if QT_CONFIG(xkbcommon)
355+#if QT_CONFIG(xkbcommon_evdev)
356 void initXKB();
357 void createXKBKeymap();
358 void createXKBState(xkb_keymap *keymap);
359@@ -128,7 +128,7 @@ private:
360 uint32_t group = 0;
361
362 bool pendingKeymap = false;
363-#if QT_CONFIG(xkbcommon)
364+#if QT_CONFIG(xkbcommon_evdev)
365 size_t keymap_size;
366 int keymap_fd = -1;
367 char *keymap_area = nullptr;
368diff --git a/src/compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri
369index 3041d769..e19ea253 100644
370--- a/src/compositor/wayland_wrapper/wayland_wrapper.pri
371+++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri
372@@ -30,5 +30,5 @@ qtConfig(wayland-datadevice) {
373
374 INCLUDEPATH += wayland_wrapper
375
376-qtConfig(xkbcommon): \
377- QMAKE_USE += xkbcommon
378+qtConfig(xkbcommon-evdev): \
379+ QMAKE_USE += xkbcommon_evdev
380diff --git a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro
381index 67e659ab..ba716c10 100644
382--- a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro
383+++ b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro
384@@ -3,8 +3,8 @@ CONFIG += wayland-scanner
385
386 QMAKE_USE += wayland-client
387
388-qtConfig(xkbcommon): \
389- QMAKE_USE += xkbcommon
390+qtConfig(xkbcommon-evdev): \
391+ QMAKE_USE += xkbcommon_evdev
392
393 WAYLANDCLIENTSOURCES += \
394 ../../../3rdparty/protocol/ivi-application.xml \
395diff --git a/src/plugins/shellintegration/wl-shell/wl-shell.pro b/src/plugins/shellintegration/wl-shell/wl-shell.pro
396index bb2c1829..fbff63c7 100644
397--- a/src/plugins/shellintegration/wl-shell/wl-shell.pro
398+++ b/src/plugins/shellintegration/wl-shell/wl-shell.pro
399@@ -2,8 +2,8 @@ QT += gui-private waylandclient-private
400 CONFIG += wayland-scanner
401
402 QMAKE_USE += wayland-client
403-qtConfig(xkbcommon): \
404- QMAKE_USE_PRIVATE += xkbcommon
405+qtConfig(xkbcommon-evdev): \
406+ QMAKE_USE_PRIVATE += xkbcommon_evdev
407
408 WAYLANDCLIENTSOURCES += \
409 ../../../3rdparty/protocol/wayland.xml
410diff --git a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro
411index 4f6dde9b..bf9edba7 100644
412--- a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro
413+++ b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro
414@@ -3,8 +3,8 @@ CONFIG += wayland-scanner
415
416 QMAKE_USE += wayland-client
417
418-qtConfig(xkbcommon): \
419- QMAKE_USE += xkbcommon
420+qtConfig(xkbcommon-evdev): \
421+ QMAKE_USE += xkbcommon_evdev
422
423 HEADERS += \
424 qwaylandxdgpopupv5_p.h \
425diff --git a/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro b/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro
426index 3c1aaee8..5d5046f6 100644
427--- a/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro
428+++ b/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro
429@@ -2,8 +2,8 @@ QT += gui-private waylandclient-private
430 CONFIG += wayland-scanner
431
432 QMAKE_USE += wayland-client
433-qtConfig(xkbcommon): \
434- QMAKE_USE_PRIVATE += xkbcommon
435+qtConfig(xkbcommon-evdev): \
436+ QMAKE_USE_PRIVATE += xkbcommon_evdev
437
438 WAYLANDCLIENTSOURCES += \
439 ../../../3rdparty/protocol/xdg-shell-unstable-v6.xml
440diff --git a/src/plugins/shellintegration/xdg-shell/xdg-shell.pro b/src/plugins/shellintegration/xdg-shell/xdg-shell.pro
441index 26171584..2b1191af 100644
442--- a/src/plugins/shellintegration/xdg-shell/xdg-shell.pro
443+++ b/src/plugins/shellintegration/xdg-shell/xdg-shell.pro
444@@ -2,8 +2,8 @@ QT += gui-private waylandclient-private
445 CONFIG += wayland-scanner
446
447 QMAKE_USE += wayland-client
448-qtConfig(xkbcommon): \
449- QMAKE_USE_PRIVATE += xkbcommon
450+qtConfig(xkbcommon-evdev): \
451+ QMAKE_USE_PRIVATE += xkbcommon_evdev
452
453 WAYLANDCLIENTSOURCES += \
454 ../../../3rdparty/protocol/xdg-decoration-unstable-v1.xml \
455diff --git a/src/shared/qwaylandxkb.cpp b/src/shared/qwaylandxkb.cpp
456index 3cfc4b07..a0e388a1 100644
457--- a/src/shared/qwaylandxkb.cpp
458+++ b/src/shared/qwaylandxkb.cpp
459@@ -43,13 +43,13 @@
460 #include <QKeyEvent>
461 #include <QString>
462
463-#if QT_CONFIG(xkbcommon)
464+#if QT_CONFIG(xkbcommon_evdev)
465 #include <xkbcommon/xkbcommon-keysyms.h>
466 #endif
467
468 QT_BEGIN_NAMESPACE
469
470-#if QT_CONFIG(xkbcommon)
471+#if QT_CONFIG(xkbcommon_evdev)
472 static const uint32_t KeyTbl[] = {
473 XKB_KEY_Escape, Qt::Key_Escape,
474 XKB_KEY_Tab, Qt::Key_Tab,
475@@ -297,7 +297,7 @@ static xkb_keysym_t toKeysymFromTable(uint32_t key)
476
477 std::pair<int, QString> QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::KeyboardModifiers &modifiers)
478 {
479-#if QT_CONFIG(xkbcommon)
480+#if QT_CONFIG(xkbcommon_evdev)
481 QString text;
482 uint utf32 = xkb_keysym_to_utf32(keysym);
483 if (utf32)
484@@ -339,7 +339,7 @@ std::pair<int, QString> QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::Keyb
485
486 Qt::KeyboardModifiers QWaylandXkb::modifiers(struct xkb_state *state)
487 {
488-#if QT_CONFIG(xkbcommon)
489+#if QT_CONFIG(xkbcommon_evdev)
490 Qt::KeyboardModifiers modifiers = Qt::NoModifier;
491
492 xkb_state_component cstate = static_cast<xkb_state_component>(XKB_STATE_DEPRESSED | XKB_STATE_LATCHED | XKB_STATE_LOCKED);
493@@ -367,7 +367,7 @@ QEvent::Type QWaylandXkb::toQtEventType(uint32_t state)
494
495 QVector<xkb_keysym_t> QWaylandXkb::toKeysym(QKeyEvent *event)
496 {
497-#if QT_CONFIG(xkbcommon)
498+#if QT_CONFIG(xkbcommon_evdev)
499 QVector<xkb_keysym_t> keysyms;
500 if (event->key() >= Qt::Key_F1 && event->key() <= Qt::Key_F35) {
501 keysyms.append(XKB_KEY_F1 + (event->key() - Qt::Key_F1));
502diff --git a/src/shared/qwaylandxkb_p.h b/src/shared/qwaylandxkb_p.h
503index 4820d94b..6fa1ea45 100644
504--- a/src/shared/qwaylandxkb_p.h
505+++ b/src/shared/qwaylandxkb_p.h
506@@ -45,7 +45,7 @@
507 #include <Qt>
508 #include <QEvent>
509
510-#if QT_CONFIG(xkbcommon)
511+#if QT_CONFIG(xkbcommon_evdev)
512 #include <xkbcommon/xkbcommon.h>
513 #else
514 typedef quint32 xkb_keysym_t;
515diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro
516index 0ce2c6be..d69db4ca 100644
517--- a/tests/auto/compositor/compositor/compositor.pro
518+++ b/tests/auto/compositor/compositor/compositor.pro
519@@ -7,8 +7,8 @@ QT += core-private gui-private waylandcompositor waylandcompositor-private
520
521 QMAKE_USE += wayland-client wayland-server
522
523-qtConfig(xkbcommon): \
524- QMAKE_USE += xkbcommon
525+qtConfig(xkbcommon-evdev): \
526+ QMAKE_USE += xkbcommon_evdev
527
528 WAYLANDCLIENTSOURCES += \
529 ../../../../src/3rdparty/protocol/xdg-shell-unstable-v5.xml \
530diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
531index 97e650d9..a8af4c39 100644
532--- a/tests/auto/compositor/compositor/tst_compositor.cpp
533+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
534@@ -58,7 +58,7 @@ class tst_WaylandCompositor : public QObject
535 private slots:
536 void init();
537 void seatCapabilities();
538-#if QT_CONFIG(xkbcommon)
539+#if QT_CONFIG(xkbcommon_evdev)
540 void simpleKeyboard();
541 void keyboardKeymaps();
542 void keyboardLayoutSwitching();
543@@ -170,7 +170,7 @@ void tst_WaylandCompositor::multipleClients()
544 QTRY_COMPARE(compositor.surfaces.size(), 0);
545 }
546
547-#if QT_CONFIG(xkbcommon)
548+#if QT_CONFIG(xkbcommon_evdev)
549
550 void tst_WaylandCompositor::simpleKeyboard()
551 {
552@@ -283,7 +283,7 @@ void tst_WaylandCompositor::keyboardLayoutSwitching()
553 QTRY_COMPARE(mockKeyboard->m_lastKeyCode, 44u);
554 }
555
556-#endif // QT_CONFIG(xkbcommon)
557+#endif // QT_CONFIG(xkbcommon_evdev)
558
559 void tst_WaylandCompositor::keyboardGrab()
560 {
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 8f901ad7..a63c49cd 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "1dc85b95ab0adc1e805d059e2c35c671ef790011" 40SRCREV = "0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb"
41 41
42BBCLASSEXTEND =+ "native nativesdk" 42BBCLASSEXTEND =+ "native nativesdk"
43 43
@@ -45,21 +45,3 @@ BBCLASSEXTEND =+ "native nativesdk"
45# http://errors.yoctoproject.org/Errors/Details/152641/ 45# http://errors.yoctoproject.org/Errors/Details/152641/
46LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 46LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
47 47
48SRC_URI += "file://0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch"
49
50# Since version 5.11.2 some private headers are not installed. Work around
51# until fixed upstream. See https://bugreports.qt.io/browse/QTBUG-71340 for
52# further details
53do_install_append() {
54 if [ -d "${B}/src/client" ]; then
55 upstream_pv=`echo "${PV}" | sed 's:+git.*::g'`
56 for header in `find ${B}/src/client -name '*wayland-*.h'`; do
57 header_base=`basename $header`
58 dest="${D}${includedir}/QtWaylandClient/$upstream_pv/QtWaylandClient/private/$header_base"
59 if [ ! -e "$dest" ]; then
60 echo "Manual install: $header_base to $dest"
61 install -m 644 "$header" "$dest"
62 fi
63 done
64 fi
65}
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index a2922918..b039ba38 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "a7bb269981ad50bd4e8140aa1d9af9e5abd0784d" 15SRCREV = "45da510a0a87593a2ae6f98e41bb01b9d39ace58"
diff --git a/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch b/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch
deleted file mode 100644
index 97f82847..00000000
--- a/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 7d8231d53a5e79eaea9fe2566f407faf41b233b4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Feb 2019 23:23:14 -0800
4Subject: [PATCH] Revert "use new feature name xkbcommon_evdev -> xkbcommon"
5
6This reverts commit 21112a89e3d742451d6b449fc7075d51266fe709.
7
8To be compatible with qtbase 5.12.0, remove this patch when upgrading
9qtbase to 5.12.1
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 src/core/web_event_factory.cpp | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
17index 06dbd7ff..a45f7048 100644
18--- a/src/core/web_event_factory.cpp
19+++ b/src/core/web_event_factory.cpp
20@@ -101,7 +101,7 @@ static KeyboardDriver keyboardDriverImpl()
21 if (platformName == QLatin1Literal("xcb") || platformName == QLatin1Literal("wayland"))
22 return KeyboardDriver::Xkb;
23
24-#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon)
25+#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon_evdev)
26 // Based on QEglFSIntegration::createInputHandlers and QLibInputKeyboard::processKey.
27 if (platformName == QLatin1Literal("eglfs") && !qEnvironmentVariableIntValue("QT_QPA_EGLFS_NO_LIBINPUT"))
28 return KeyboardDriver::Xkb;
29--
302.20.1
31
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index ee87c884..d6730cf9 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -139,7 +139,6 @@ QT_MODULE_BRANCH_CHROMIUM = "69-based"
139SRC_URI += " \ 139SRC_URI += " \
140 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 140 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
141 file://0001-Force-host-toolchain-configuration.patch \ 141 file://0001-Force-host-toolchain-configuration.patch \
142 file://0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch \
143" 142"
144SRC_URI_append_libc-musl = "\ 143SRC_URI_append_libc-musl = "\
145 file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ 144 file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
@@ -175,8 +174,8 @@ SRC_URI_append_libc-musl = "\
175 file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 174 file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
176" 175"
177 176
178SRCREV_qtwebengine = "4f1e0003d98116e33a847360e0e95c46daae25fc" 177SRCREV_qtwebengine = "92b078a534390dba64a0dcebcffdab4ce24581b6"
179SRCREV_chromium = "323b45aa242e0b4e75689d67418ec124ba1ca815" 178SRCREV_chromium = "43316b156e65f867a76ed2afd96bf30696c5f4f6"
180SRCREV = "${SRCREV_qtwebengine}" 179SRCREV = "${SRCREV_qtwebengine}"
181 180
182SRCREV_FORMAT = "qtwebengine_chromium" 181SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index 7e5a8b2d..7faa3795 100644
--- a/recipes-qt/qt5/qtwebglplugin_git.bb
+++ b/recipes-qt/qt5/qtwebglplugin_git.bb
@@ -18,4 +18,4 @@ do_configure_prepend() {
18 18
19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
20 20
21SRCREV = "d0c4de38ddc18792c7a8a90ef2d0091b51736dd3" 21SRCREV = "b1662da58d05dd53b5d4c84a3518c65f417cefd8"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index e79ada8c..4ed72dc7 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "a53a28b971e3ae1a4a2baf7320ba60f5077f5596" 14SRCREV = "b4bac09b3b2f0c3072d797b22c44e20b661c4723"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index f7f52588..a7a66387 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "a14a1174cdc7ee2142abd33f85ea820eca90c968" 22SRCREV = "0aa43dc555e0a820bf13a6b12671ee6a79161155"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 986c1109..dfd305d3 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c" 15SRCREV = "3bfaa26890990d140caba4b9a1050906c2ee546c"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index d9a1a9a9..9ec19415 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -25,7 +25,7 @@ do_configure_prepend() {
25 25
26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
27 27
28SRCREV = "274f162fd41c4de88df7efda9e6ec16a1ca968bc" 28SRCREV = "e8026ec6a30c5124c2e3162d9a17e9ae11fa4475"
29 29
30BBCLASSEXTEND =+ "native nativesdk" 30BBCLASSEXTEND =+ "native nativesdk"
31 31
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-05 05:09:51 +0000