diff options
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 += "\ file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0018-Fix-compile-issue-with-gcc-9.patch \ - file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ - file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ - file://0023-build-failure-with-clang.patch \ " # common for qtbase-native and nativesdk-qtbase @@ -197,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" +SRCREV = "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 @@ -From d3053e33c76cdb41eeeec3c853fa88c7c7bfb8a5 Mon Sep 17 00:00:00 2001 +From ee6c6dc4183234a6f092d9e5b8d05eaab8ee5382 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 17 Aug 2018 13:23:58 +0300 Subject: [PATCH] Allow a tools-only build --- - qt3d.pro | 7 ++++++- + qt3d.pro | 9 +++++++-- src/3rdparty/assimp/assimp_dependency.pri | 2 +- tools/tools.pro | 2 +- - 3 files changed, 8 insertions(+), 3 deletions(-) + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index 3fc7d1452..7311eff5b 100644 +index 847507f17..286286dd0 100644 --- a/qt3d.pro +++ b/qt3d.pro -@@ -1,4 +1,4 @@ +@@ -1,5 +1,5 @@ +-requires(qtHaveModule(gui)) -requires(qtConfig(opengl):!wasm) ++!tools-only:requires(qtHaveModule(gui)) +!tools-only:requires(qtConfig(opengl):!wasm) CONFIG += examples_need_tools load(qt_parts) -@@ -14,3 +14,8 @@ load(qt_parts) +@@ -15,3 +15,8 @@ load(qt_parts) OTHER_FILES += \ 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() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "338addb5a79c32d5b7b3013746c6d5250e1581fe" +SRCREV = "3de900a10c6fd051ba54727be2fd1fe47ed10481" BBCLASSEXTEND += "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" S = "${WORKDIR}/git" -PV = "5.12.0+git${SRCPV}" +PV = "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 += "\ file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0018-Fix-compile-issue-with-gcc-9.patch \ - file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ - file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ - file://0023-build-failure-with-clang.patch \ " # common for qtbase-native and nativesdk-qtbase @@ -143,4 +139,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" +SRCREV = "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 @@ -From 4bc9f80bb0875648a2f3eca5b14e4e9e56cfda4d Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Tue, 13 Nov 2018 16:00:23 +0100 -Subject: [PATCH] Fix compile issue with gcc 9 - -It appears messenne_twisters in the latest libstdc++ has one more -requirement before it is willing to construct with our -SystemGenerator struct as an sseq provider. - -Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe -Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- - src/corelib/global/qrandom.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 23e5e499b2..03534cf453 100644 ---- a/src/corelib/global/qrandom.cpp -+++ b/src/corelib/global/qrandom.cpp -@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator - #endif // Q_OS_WINRT - - static SystemGenerator &self(); -+ typedef quint32 result_type; - void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); - - // 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 @@ -From 4bcd7b1c6e06cfaef1a52795df007f1a9372eeed Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen <ville.voutilainen@qt.io> -Date: Wed, 21 Nov 2018 14:07:18 +0200 -Subject: [PATCH] Fix compilation of qendian's qswap specializations on gcc 4.8 - -Task-number: QTBUG-71945 -Change-Id: Icf2b75c72946f57ebffc880c9238531dea13ab5b -Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> -Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> ---- - src/corelib/global/qendian.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 0e67a1ab8e..f2e5833468 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source) - return qFromUnaligned<Float>(&temp); - } - --template <> inline qfloat16 qbswap<qfloat16>(qfloat16 source) -+inline qfloat16 qbswap(qfloat16 source) - { - return qbswapFloatHelper(source); - } - --template <> inline float qbswap<float>(float source) -+inline float qbswap(float source) - { - return qbswapFloatHelper(source); - } - --template <> inline double qbswap<double>(double source) -+inline double qbswap(double source) - { - return qbswapFloatHelper(source); - } -@@ -185,7 +185,7 @@ template <> inline double qbswap<double>(double source) - */ - template <typename T> inline void qbswap(const T src, void *dest) - { -- qToUnaligned<T>(qbswap<T>(src), dest); -+ qToUnaligned<T>(qbswap(src), dest); - } - - template <int Size> void *qbswap(const void *source, qsizetype count, void *dest) noexcept; -@@ -223,9 +223,9 @@ template <typename T> inline void qFromLittleEndian(const void *source, qsizetyp - #else // Q_LITTLE_ENDIAN - - template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source) --{ return qbswap<T>(source); } -+{ return qbswap(source); } - template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) --{ return qbswap<T>(source); } -+{ return qbswap(source); } - template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) - { return source; } - 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 @@ -From c94a6510ae983e46f60e0cfb1b0f20229c990d93 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen <ville.voutilainen@qt.io> -Date: Fri, 4 Jan 2019 09:35:40 +0200 -Subject: [PATCH] Fix qbswap calls for Big Endian targets - -Upstream-Status: Backport -Task-number: QTBUG-71945 -Change-Id: I5356f8e32d00ea591b1f65cdd4111276fcf876ac ---- - src/corelib/global/qendian.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index f2e5833468..615f523888 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -204,9 +204,9 @@ template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source) - template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) - { return source; } - template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) --{ return qbswap<T>(source); } -+{ return qbswap(source); } - template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) --{ return qbswap<T>(source); } -+{ return qbswap(source); } - template <typename T> inline void qToBigEndian(T src, void *dest) - { qToUnaligned<T>(src, dest); } - 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 @@ -From f958dccc8c7c777aaca1f110ed48c71b28fdea92 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 1 Mar 2019 15:11:19 -0800 -Subject: [PATCH] Fix build failure with clang - -Complement below commit - -commit 1555894dec537cbc422f43fe959b0d0ee0000881 -Author: Thiago Macieira <thiago.macieira@intel.com> -Date: Wed Jul 25 19:04:20 2018 -0700 - - QCborValue: Disable support for spaceship operator - - __has_include(<compare>) is not the correct way to detect this feature, - since that's a library header and may be provided by an implementation - (libc++) before the compiler supports the syntax. - - Change-Id: I80aae0d068974d83b6c0fffd1544c8e558e2446b - Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> - -Fixes -tst_qcborvalue.cpp:336:17: error: invalid operands to binary expression ('QCborValue' and 'QCborValue') - QVERIFY(!(v > other)); - ~ ^ ~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp -index 38b26e7de4..4b753eab6b 100644 ---- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp -+++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp -@@ -330,7 +330,7 @@ void tst_QCborValue::copyCompare() - QCOMPARE(v, other); - QVERIFY(!(v != other)); - QVERIFY(!(v < other)); --#if QT_HAS_INCLUDE(<compare>) -+#if 0 && QT_HAS_INCLUDE(<compare>) - QVERIFY(v <= other); - QVERIFY(v >= other); - QVERIFY(!(v > other)); --- -2.21.0 - 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 += "\ file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0018-Fix-compile-issue-with-gcc-9.patch \ - file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ - file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ - file://0023-build-failure-with-clang.patch \ " - # for syncqt RDEPENDS_${PN}-tools += "perl" @@ -68,7 +63,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f # separate some parts of PACKAGECONFIG which are often changed PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" -PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon-evdev', '', d)}" +PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon', '', d)}" PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite accessibility openssl', '', d)}" PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" @@ -144,7 +139,7 @@ PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3" PACKAGECONFIG[xcb-xinput] = "-xcb-xinput,-no-xcb-xinput,libxcb" PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" -PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config" +PACKAGECONFIG[xkbcommon] = "-xkbcommon,-no-xkbcommon,libxkbcommon,xkeyboard-config" PACKAGECONFIG[evdev] = "-evdev,-no-evdev" PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" # depends on glib @@ -294,4 +289,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" +SRCREV = "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 = " \ DEPENDS = "qtdeclarative" -SRCREV = "f0552b1eb14568fa6802191d13a1123effdbb636" +SRCREV = "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 = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "b36af85eac67c2e92b35849b34d913ee0290cd2b" +SRCREV = "c9bc2672b513a414708026f4271d247feaa26471" # The same issue as in qtbase: # 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}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "e9967647ffe20df0473a1fa9eb10957b4e32fbf3" +SRCREV = "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 = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "20f42d4c87162992fc2322e65aee1a1e2b1f28a2" +SRCREV = "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() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "c401ae278b4bb91c70c6d7df974a241d7c68855b" +SRCREV = "cd7ce85ff0b8f9a5163c7dc276dc7751c3f51f0f" BBCLASSEXTEND =+ "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" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "2d532f3d84654e75273af4a5a34310413555e00f" +SRCREV = "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 = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "5b24291329cdbd19b795b4c3d8aafc4ffd916a2d" +SRCREV = "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" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "178b8572d71a34975ffd7ada87227e1b8ed7296e" +SRCREV = "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 = " \ DEPENDS += "qtbase" -SRCREV = "3c6e84d7b39014d5df6750f096bc31a5b24e164b" +SRCREV = "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 += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "a4442abdc034de7984e003c821939ce1b1976593" +SRCREV_qtlocation = "a00c5e40a2df03713d29da83a5692f2d7c15326d" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_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 = " \ DEPENDS += "qtbase" -SRCREV = "bf30507ef17445b464abe230f4bf349d732fbfd1" +SRCREV = "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 += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "7b0b5bb0b9e15ad54b061ee39712ce86235535d5" +SRCREV = "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 DEPENDS += "qtbase" -SRCREV = "71318ed079ddf7c0c3af9d70f64b9519e23b7499" +SRCREV = "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 = " \ file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ " -DEPENDS += "qtbase" +# src/3rdparty/open62541.pri adds -Wno-format, causing following error +# because -Wformat-security cannot be used together with -Wno-format +# cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] +SECURITY_STRINGFORMAT = "" -SRCREV = "fd6f1d80aa501d8d003018359ce9c023e70732d5" +DEPENDS += "qtbase qtdeclarative" + +SRCREV = "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 = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "2de8d672b596c6a67afc2a72a293a08d0a3912d8" +SRCREV = "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 = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "69f02184a9a71f3a5e2dd1ada12367ddccd29787" +SRCREV = "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 += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb" +SRCREV = "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" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "5bc5f04be23237f9d55b2134ae55bd93bed342a0" +SRCREV = "1c19349a28a75eec386b84af142fc571e492a3c3" BBCLASSEXTEND += "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 @@ -From 03cdaf779e0d8587c6e110f1f834a15e2d3317fd Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Mon, 28 Jan 2019 14:33:12 -0800 -Subject: [PATCH] Fix build with GCC 8.3 - -Qualifiers in the asm statement are not allowed in the global scope. I -thought they were necessary for LTO, but I the commit to this file that -added them predates my work on setting up LTO for GCC. - -Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> ---- - .../JavaScriptCore/jit/JITStubs.cpp | 48 +++++++++---------- - 1 file changed, 24 insertions(+), 24 deletions(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp -index 1abdf8b..9f60761 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp -@@ -116,7 +116,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, JITStackFrame_s - COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_callFrame_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -138,7 +138,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -154,7 +154,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -179,7 +179,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_s - COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" - SYMBOL_STRING(ctiTrampoline) ":" "\n" -@@ -206,7 +206,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -222,7 +222,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -242,7 +242,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." - #endif - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" -@@ -269,7 +269,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" -@@ -287,7 +287,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" -@@ -305,7 +305,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - - #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" - SYMBOL_STRING(ctiTrampoline) ":" "\n" -@@ -323,7 +323,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "mov pc, lr" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -418,7 +418,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_ - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -440,7 +440,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -456,7 +456,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -480,7 +480,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_ - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x48, JITStackFrame_code_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x78, JITStackFrame_stub_argument_space_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -515,7 +515,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -531,7 +531,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -551,7 +551,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." - #endif - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" -@@ -578,7 +578,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" -@@ -596,7 +596,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" -@@ -614,7 +614,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - - #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -632,7 +632,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "mov pc, lr" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -1024,7 +1024,7 @@ static NEVER_INLINE void throwStackOverflowError(CallFrame* callFrame, JSGlobalD - extern "C" { \ - rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ - }; \ -- asm volatile ( \ -+ asm ( \ - ".text" "\n" \ - ".align 2" "\n" \ - ".globl " SYMBOL_STRING(cti_##op) "\n" \ -@@ -1053,7 +1053,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, thunkReturnAddress) == THUNK_RETUR - extern "C" { \ - rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ - }; \ -- asm volatile ( \ -+ asm ( \ - ".globl " SYMBOL_STRING(cti_##op) "\n" \ - HIDE_SYMBOL(cti_##op) "\n" \ - 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 = " \ # 5.12.meta-qt5.2 SRC_URI += " \ file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ - file://0002-Fix-build-with-GCC-8.3.patch \ " # qemuarm build fails with: @@ -37,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "0be84da60090e9d20ec0066bcd3900ca5572df95" +SRCREV = "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 DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "1043e8abd566aa92f63acedbe188a51e83b9555c" +SRCREV = "4bb7aa3f3002b9ba85494e5cf4808f68e0edc502" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 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 = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "36d12d57b0b291b660b2bdb9e1b3ae855e2fc4c0" +SRCREV = "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 = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "ce265ff81223bf7a5978e66dba59fb4b10469b9e" +SRCREV = "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 = " \ DEPENDS += "qtbase" -SRCREV = "a15a7f1362454a575a4420cdd89498f42055fe48" +SRCREV = "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 = " \ DEPENDS += "qtbase" -SRCREV = "aa7431fdabc0434bc30ae8af0753be8c1cb9b576" +SRCREV = "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() { QT_MODULE_BRANCH = "dev" -SRCREV = "66e45676f5f5c6251ccab36906c6324fd0065e08" +SRCREV = "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 += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "4e823c69ec36b648d6126ae5ec031f58d1372ab4" +SRCREV = "b0147a5d79ce7a7e77a24f36aaddfacb1a1517c8" BBCLASSEXTEND = "native nativesdk" 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 = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a" +SRCREV = "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" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "5aaf55adcf3742e05283274ce1b8c721c7da7c8d" +SRCREV = "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 @@ -From 6a3be262635cff2811e6da6799c17980a0f67bef Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 22 Dec 2018 18:03:56 +0000 -Subject: [PATCH] Revert "use new feature name xkbcommon_evdev -> xkbcommon" - -This reverts commit a8fed20181729cae70de43079c4a34ad1780cfd7. - -To be compatible with qtbase 5.12.0, remove this patch when upgrading -qtbase to 5.12.1 ---- - README | 4 ++-- - src/client/client.pro | 4 ++-- - src/client/qwaylandinputdevice.cpp | 22 +++++++++---------- - src/client/qwaylandinputdevice_p.h | 10 ++++----- - .../compositor_api/qwaylandcompositor.cpp | 2 +- - .../compositor_api/qwaylandkeyboard.cpp | 22 +++++++++---------- - .../compositor_api/qwaylandkeyboard_p.h | 8 +++---- - .../wayland_wrapper/wayland_wrapper.pri | 4 ++-- - .../shellintegration/ivi-shell/ivi-shell.pro | 4 ++-- - .../shellintegration/wl-shell/wl-shell.pro | 4 ++-- - .../xdg-shell-v5/xdg-shell-v5.pro | 4 ++-- - .../xdg-shell-v6/xdg-shell-v6.pro | 4 ++-- - .../shellintegration/xdg-shell/xdg-shell.pro | 4 ++-- - src/shared/qwaylandxkb.cpp | 10 ++++----- - src/shared/qwaylandxkb_p.h | 2 +- - .../auto/compositor/compositor/compositor.pro | 4 ++-- - .../compositor/compositor/tst_compositor.cpp | 6 ++--- - 17 files changed, 59 insertions(+), 59 deletions(-) - -diff --git a/README b/README -index bc6569ef..4fd99495 100644 ---- a/README -+++ b/README -@@ -9,8 +9,8 @@ QtWaylandCompositor API: - Enables the creation of Wayland compositors using Qt and QtQuick. - - To build the QtWayland module you need the external dependencies: --xkbcommon - http://xkbcommon.org/ --wayland - http://wayland.freedesktop.org/ -+xkbcommon 0.2.0 - http://xkbcommon.org/ -+wayland 1.6.0 - http://wayland.freedesktop.org/ - - QtWaylandCompositor supports loading client buffer integrations that don't use - the wayland-egl interfaces. These client buffer integrations are picked up by -diff --git a/src/client/client.pro b/src/client/client.pro -index 30f32dd7..45bbb976 100644 ---- a/src/client/client.pro -+++ b/src/client/client.pro -@@ -15,8 +15,8 @@ use_gold_linker: CONFIG += no_linker_version_script - CONFIG -= precompile_header - CONFIG += link_pkgconfig wayland-scanner - --qtConfig(xkbcommon): \ -- QMAKE_USE_PRIVATE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE_PRIVATE += xkbcommon_evdev - - QMAKE_USE += wayland-client - -diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp -index ba55e6e1..9d675ae2 100644 ---- a/src/client/qwaylandinputdevice.cpp -+++ b/src/client/qwaylandinputdevice.cpp -@@ -70,7 +70,7 @@ - - #include <QtGui/QGuiApplication> - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include <xkbcommon/xkbcommon-compose.h> - #endif - -@@ -84,7 +84,7 @@ QWaylandInputDevice::Keyboard::Keyboard(QWaylandInputDevice *p) - connect(&mRepeatTimer, SIGNAL(timeout()), this, SLOT(repeatKey())); - } - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - bool QWaylandInputDevice::Keyboard::createDefaultKeyMap() - { - if (mXkbContext && mXkbMap && mXkbState) { -@@ -156,7 +156,7 @@ void QWaylandInputDevice::Keyboard::releaseComposeState() - - QWaylandInputDevice::Keyboard::~Keyboard() - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - releaseComposeState(); - releaseKeyMap(); - #endif -@@ -344,7 +344,7 @@ Qt::KeyboardModifiers QWaylandInputDevice::Keyboard::modifiers() const - { - Qt::KeyboardModifiers ret = Qt::NoModifier; - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (!mXkbState) - return ret; - -@@ -625,7 +625,7 @@ void QWaylandInputDevice::Pointer::pointer_axis(uint32_t time, uint32_t axis, in - - void QWaylandInputDevice::Keyboard::keyboard_keymap(uint32_t format, int32_t fd, uint32_t size) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { - close(fd); - return; -@@ -728,7 +728,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time, - if (isDown) - mParent->mQDisplay->setLastInputDevice(mParent, serial, window); - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (!createDefaultKeyMap()) { - return; - } -@@ -771,7 +771,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time, - #endif - - if (state == WL_KEYBOARD_KEY_STATE_PRESSED --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - && xkb_keymap_key_repeats(mXkbMap, code) - #endif - ) { -@@ -779,7 +779,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time, - mRepeatCode = code; - mRepeatTime = time; - mRepeatText = text; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - mRepeatSym = sym; - #endif - mRepeatTimer.setInterval(400); -@@ -793,7 +793,7 @@ void QWaylandInputDevice::Keyboard::repeatKey() - { - mRepeatTimer.setInterval(25); - sendKey(mFocus->window(), mRepeatTime, QEvent::KeyRelease, mRepeatKey, modifiers(), mRepeatCode, --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - mRepeatSym, mNativeModifiers, - #else - 0, 0, -@@ -801,7 +801,7 @@ void QWaylandInputDevice::Keyboard::repeatKey() - mRepeatText, true); - - sendKey(mFocus->window(), mRepeatTime, QEvent::KeyPress, mRepeatKey, modifiers(), mRepeatCode, --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - mRepeatSym, mNativeModifiers, - #else - 0, 0, -@@ -816,7 +816,7 @@ void QWaylandInputDevice::Keyboard::keyboard_modifiers(uint32_t serial, - uint32_t group) - { - Q_UNUSED(serial); --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (mXkbState) - xkb_state_update_mask(mXkbState, - mods_depressed, mods_latched, mods_locked, -diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h -index 7aa86539..4b12cc08 100644 ---- a/src/client/qwaylandinputdevice_p.h -+++ b/src/client/qwaylandinputdevice_p.h -@@ -65,7 +65,7 @@ - - #include <QtWaylandClient/private/qwayland-wayland.h> - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include <xkbcommon/xkbcommon.h> - #include <xkbcommon/xkbcommon-keysyms.h> - #endif -@@ -77,7 +77,7 @@ - struct wl_cursor_image; - #endif - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - struct xkb_compose_state; - struct xkb_compose_table; - #endif -@@ -209,7 +209,7 @@ public: - - QWaylandInputDevice *mParent = nullptr; - QPointer<QWaylandWindow> mFocus; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - xkb_context *mXkbContext = nullptr; - xkb_keymap *mXkbMap = nullptr; - xkb_state *mXkbState = nullptr; -@@ -222,7 +222,7 @@ public: - uint32_t mRepeatCode; - uint32_t mRepeatTime; - QString mRepeatText; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - xkb_keysym_t mRepeatSym; - #endif - QTimer mRepeatTimer; -@@ -233,7 +233,7 @@ private slots: - void repeatKey(); - - private: --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - bool createDefaultKeyMap(); - void releaseKeyMap(); - void createComposeState(); -diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp -index 173b50ce..c782304e 100644 ---- a/src/compositor/compositor_api/qwaylandcompositor.cpp -+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp -@@ -128,7 +128,7 @@ public: - uint32_t code = ke->nativeScanCode; - bool isDown = ke->keyType == QEvent::KeyPress; - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - QString text; - Qt::KeyboardModifiers modifiers = QWaylandXkb::modifiers(keyb->xkbState()); - -diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp -index 68d855a6..e067eeaf 100644 ---- a/src/compositor/compositor_api/qwaylandkeyboard.cpp -+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp -@@ -51,7 +51,7 @@ - - #include <fcntl.h> - #include <unistd.h> --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include <sys/mman.h> - #include <sys/types.h> - #include <qwaylandxkb_p.h> -@@ -66,7 +66,7 @@ QWaylandKeyboardPrivate::QWaylandKeyboardPrivate(QWaylandSeat *seat) - - QWaylandKeyboardPrivate::~QWaylandKeyboardPrivate() - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (xkb_context) { - if (keymap_area) - munmap(keymap_area, keymap_size); -@@ -136,7 +136,7 @@ void QWaylandKeyboardPrivate::keyboard_bind_resource(wl_keyboard::Resource *reso - if (resource->version() >= WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION) - send_repeat_info(resource->handle, repeatRate, repeatDelay); - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (xkb_context) { - send_keymap(resource->handle, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, - keymap_fd, keymap_size); -@@ -164,7 +164,7 @@ void QWaylandKeyboardPrivate::keyboard_release(wl_keyboard::Resource *resource) - - void QWaylandKeyboardPrivate::keyEvent(uint code, uint32_t state) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - uint key = toWaylandXkbV1Key(code); - #else - uint key = code; -@@ -180,7 +180,7 @@ void QWaylandKeyboardPrivate::sendKeyEvent(uint code, uint32_t state) - { - uint32_t time = compositor()->currentTimeMsecs(); - uint32_t serial = compositor()->nextSerial(); --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - uint key = toWaylandXkbV1Key(code); - #else - uint key = code; -@@ -197,7 +197,7 @@ void QWaylandKeyboardPrivate::modifiers(uint32_t serial, uint32_t mods_depressed - } - } - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - void QWaylandKeyboardPrivate::maybeUpdateXkbScanCodeTable() - { - if (!scanCodesByQtKey.isEmpty() || !xkbState()) -@@ -225,7 +225,7 @@ void QWaylandKeyboardPrivate::maybeUpdateXkbScanCodeTable() - - void QWaylandKeyboardPrivate::updateModifierState(uint code, uint32_t state) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (!xkb_context) - return; - -@@ -265,7 +265,7 @@ void QWaylandKeyboardPrivate::maybeUpdateKeymap() - return; - - pendingKeymap = false; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (!xkb_context) - return; - -@@ -285,7 +285,7 @@ void QWaylandKeyboardPrivate::maybeUpdateKeymap() - #endif - } - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - static int createAnonymousFile(size_t size) - { - QString path = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation); -@@ -429,7 +429,7 @@ QWaylandKeyboard::QWaylandKeyboard(QWaylandSeat *seat, QObject *parent) - connect(keymap, &QWaylandKeymap::optionsChanged, this, &QWaylandKeyboard::updateKeymap); - connect(keymap, &QWaylandKeymap::rulesChanged, this, &QWaylandKeyboard::updateKeymap); - connect(keymap, &QWaylandKeymap::modelChanged, this, &QWaylandKeyboard::updateKeymap); --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - d->initXKB(); - #endif - } -@@ -592,7 +592,7 @@ void QWaylandKeyboard::addClient(QWaylandClient *client, uint32_t id, uint32_t v - uint QWaylandKeyboard::keyToScanCode(int qtKey) const - { - uint scanCode = 0; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - Q_D(const QWaylandKeyboard); - const_cast<QWaylandKeyboardPrivate *>(d)->maybeUpdateXkbScanCodeTable(); - scanCode = d->scanCodesByQtKey.value({d->group, qtKey}, 0); -diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h -index 87e89e85..cd1f2795 100644 ---- a/src/compositor/compositor_api/qwaylandkeyboard_p.h -+++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h -@@ -62,7 +62,7 @@ - - #include <QtCore/QVector> - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include <xkbcommon/xkbcommon.h> - #endif - -@@ -86,7 +86,7 @@ public: - void modifiers(uint32_t serial, uint32_t mods_depressed, - uint32_t mods_latched, uint32_t mods_locked, uint32_t group); - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - struct xkb_state *xkbState() const { return xkb_state; } - uint32_t xkbModsMask() const { return modsDepressed | modsLatched | modsLocked; } - void maybeUpdateXkbScanCodeTable(); -@@ -106,7 +106,7 @@ protected: - void keyboard_release(Resource *resource) override; - - private: --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - void initXKB(); - void createXKBKeymap(); - void createXKBState(xkb_keymap *keymap); -@@ -128,7 +128,7 @@ private: - uint32_t group = 0; - - bool pendingKeymap = false; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - size_t keymap_size; - int keymap_fd = -1; - char *keymap_area = nullptr; -diff --git a/src/compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri -index 3041d769..e19ea253 100644 ---- a/src/compositor/wayland_wrapper/wayland_wrapper.pri -+++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri -@@ -30,5 +30,5 @@ qtConfig(wayland-datadevice) { - - INCLUDEPATH += wayland_wrapper - --qtConfig(xkbcommon): \ -- QMAKE_USE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE += xkbcommon_evdev -diff --git a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro -index 67e659ab..ba716c10 100644 ---- a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro -+++ b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro -@@ -3,8 +3,8 @@ CONFIG += wayland-scanner - - QMAKE_USE += wayland-client - --qtConfig(xkbcommon): \ -- QMAKE_USE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE += xkbcommon_evdev - - WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/ivi-application.xml \ -diff --git a/src/plugins/shellintegration/wl-shell/wl-shell.pro b/src/plugins/shellintegration/wl-shell/wl-shell.pro -index bb2c1829..fbff63c7 100644 ---- a/src/plugins/shellintegration/wl-shell/wl-shell.pro -+++ b/src/plugins/shellintegration/wl-shell/wl-shell.pro -@@ -2,8 +2,8 @@ QT += gui-private waylandclient-private - CONFIG += wayland-scanner - - QMAKE_USE += wayland-client --qtConfig(xkbcommon): \ -- QMAKE_USE_PRIVATE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE_PRIVATE += xkbcommon_evdev - - WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/wayland.xml -diff --git a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro -index 4f6dde9b..bf9edba7 100644 ---- a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro -+++ b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro -@@ -3,8 +3,8 @@ CONFIG += wayland-scanner - - QMAKE_USE += wayland-client - --qtConfig(xkbcommon): \ -- QMAKE_USE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE += xkbcommon_evdev - - HEADERS += \ - qwaylandxdgpopupv5_p.h \ -diff --git a/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro b/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro -index 3c1aaee8..5d5046f6 100644 ---- a/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro -+++ b/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro -@@ -2,8 +2,8 @@ QT += gui-private waylandclient-private - CONFIG += wayland-scanner - - QMAKE_USE += wayland-client --qtConfig(xkbcommon): \ -- QMAKE_USE_PRIVATE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE_PRIVATE += xkbcommon_evdev - - WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/xdg-shell-unstable-v6.xml -diff --git a/src/plugins/shellintegration/xdg-shell/xdg-shell.pro b/src/plugins/shellintegration/xdg-shell/xdg-shell.pro -index 26171584..2b1191af 100644 ---- a/src/plugins/shellintegration/xdg-shell/xdg-shell.pro -+++ b/src/plugins/shellintegration/xdg-shell/xdg-shell.pro -@@ -2,8 +2,8 @@ QT += gui-private waylandclient-private - CONFIG += wayland-scanner - - QMAKE_USE += wayland-client --qtConfig(xkbcommon): \ -- QMAKE_USE_PRIVATE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE_PRIVATE += xkbcommon_evdev - - WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/xdg-decoration-unstable-v1.xml \ -diff --git a/src/shared/qwaylandxkb.cpp b/src/shared/qwaylandxkb.cpp -index 3cfc4b07..a0e388a1 100644 ---- a/src/shared/qwaylandxkb.cpp -+++ b/src/shared/qwaylandxkb.cpp -@@ -43,13 +43,13 @@ - #include <QKeyEvent> - #include <QString> - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include <xkbcommon/xkbcommon-keysyms.h> - #endif - - QT_BEGIN_NAMESPACE - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - static const uint32_t KeyTbl[] = { - XKB_KEY_Escape, Qt::Key_Escape, - XKB_KEY_Tab, Qt::Key_Tab, -@@ -297,7 +297,7 @@ static xkb_keysym_t toKeysymFromTable(uint32_t key) - - std::pair<int, QString> QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::KeyboardModifiers &modifiers) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - QString text; - uint utf32 = xkb_keysym_to_utf32(keysym); - if (utf32) -@@ -339,7 +339,7 @@ std::pair<int, QString> QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::Keyb - - Qt::KeyboardModifiers QWaylandXkb::modifiers(struct xkb_state *state) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - Qt::KeyboardModifiers modifiers = Qt::NoModifier; - - xkb_state_component cstate = static_cast<xkb_state_component>(XKB_STATE_DEPRESSED | XKB_STATE_LATCHED | XKB_STATE_LOCKED); -@@ -367,7 +367,7 @@ QEvent::Type QWaylandXkb::toQtEventType(uint32_t state) - - QVector<xkb_keysym_t> QWaylandXkb::toKeysym(QKeyEvent *event) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - QVector<xkb_keysym_t> keysyms; - if (event->key() >= Qt::Key_F1 && event->key() <= Qt::Key_F35) { - keysyms.append(XKB_KEY_F1 + (event->key() - Qt::Key_F1)); -diff --git a/src/shared/qwaylandxkb_p.h b/src/shared/qwaylandxkb_p.h -index 4820d94b..6fa1ea45 100644 ---- a/src/shared/qwaylandxkb_p.h -+++ b/src/shared/qwaylandxkb_p.h -@@ -45,7 +45,7 @@ - #include <Qt> - #include <QEvent> - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include <xkbcommon/xkbcommon.h> - #else - typedef quint32 xkb_keysym_t; -diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro -index 0ce2c6be..d69db4ca 100644 ---- a/tests/auto/compositor/compositor/compositor.pro -+++ b/tests/auto/compositor/compositor/compositor.pro -@@ -7,8 +7,8 @@ QT += core-private gui-private waylandcompositor waylandcompositor-private - - QMAKE_USE += wayland-client wayland-server - --qtConfig(xkbcommon): \ -- QMAKE_USE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE += xkbcommon_evdev - - WAYLANDCLIENTSOURCES += \ - ../../../../src/3rdparty/protocol/xdg-shell-unstable-v5.xml \ -diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp -index 97e650d9..a8af4c39 100644 ---- a/tests/auto/compositor/compositor/tst_compositor.cpp -+++ b/tests/auto/compositor/compositor/tst_compositor.cpp -@@ -58,7 +58,7 @@ class tst_WaylandCompositor : public QObject - private slots: - void init(); - void seatCapabilities(); --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - void simpleKeyboard(); - void keyboardKeymaps(); - void keyboardLayoutSwitching(); -@@ -170,7 +170,7 @@ void tst_WaylandCompositor::multipleClients() - QTRY_COMPARE(compositor.surfaces.size(), 0); - } - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - - void tst_WaylandCompositor::simpleKeyboard() - { -@@ -283,7 +283,7 @@ void tst_WaylandCompositor::keyboardLayoutSwitching() - QTRY_COMPARE(mockKeyboard->m_lastKeyCode, 44u); - } - --#endif // QT_CONFIG(xkbcommon) -+#endif // QT_CONFIG(xkbcommon_evdev) - - void tst_WaylandCompositor::keyboardGrab() - { 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 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1dc85b95ab0adc1e805d059e2c35c671ef790011" +SRCREV = "0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb" BBCLASSEXTEND =+ "native nativesdk" @@ -45,21 +45,3 @@ BBCLASSEXTEND =+ "native nativesdk" # http://errors.yoctoproject.org/Errors/Details/152641/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRC_URI += "file://0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch" - -# Since version 5.11.2 some private headers are not installed. Work around -# until fixed upstream. See https://bugreports.qt.io/browse/QTBUG-71340 for -# further details -do_install_append() { - if [ -d "${B}/src/client" ]; then - upstream_pv=`echo "${PV}" | sed 's:+git.*::g'` - for header in `find ${B}/src/client -name '*wayland-*.h'`; do - header_base=`basename $header` - dest="${D}${includedir}/QtWaylandClient/$upstream_pv/QtWaylandClient/private/$header_base" - if [ ! -e "$dest" ]; then - echo "Manual install: $header_base to $dest" - install -m 644 "$header" "$dest" - fi - done - fi -} 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 = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "a7bb269981ad50bd4e8140aa1d9af9e5abd0784d" +SRCREV = "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 @@ -From 7d8231d53a5e79eaea9fe2566f407faf41b233b4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 2 Feb 2019 23:23:14 -0800 -Subject: [PATCH] Revert "use new feature name xkbcommon_evdev -> xkbcommon" - -This reverts commit 21112a89e3d742451d6b449fc7075d51266fe709. - -To be compatible with qtbase 5.12.0, remove this patch when upgrading -qtbase to 5.12.1 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/core/web_event_factory.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp -index 06dbd7ff..a45f7048 100644 ---- a/src/core/web_event_factory.cpp -+++ b/src/core/web_event_factory.cpp -@@ -101,7 +101,7 @@ static KeyboardDriver keyboardDriverImpl() - if (platformName == QLatin1Literal("xcb") || platformName == QLatin1Literal("wayland")) - return KeyboardDriver::Xkb; - --#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon) -+#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon_evdev) - // Based on QEglFSIntegration::createInputHandlers and QLibInputKeyboard::processKey. - if (platformName == QLatin1Literal("eglfs") && !qEnvironmentVariableIntValue("QT_QPA_EGLFS_NO_LIBINPUT")) - return KeyboardDriver::Xkb; --- -2.20.1 - 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" SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ - file://0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch \ " SRC_URI_append_libc-musl = "\ file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ @@ -175,8 +174,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "4f1e0003d98116e33a847360e0e95c46daae25fc" -SRCREV_chromium = "323b45aa242e0b4e75689d67418ec124ba1ca815" +SRCREV_qtwebengine = "92b078a534390dba64a0dcebcffdab4ce24581b6" +SRCREV_chromium = "43316b156e65f867a76ed2afd96bf30696c5f4f6" SRCREV = "${SRCREV_qtwebengine}" SRCREV_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() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "d0c4de38ddc18792c7a8a90ef2d0091b51736dd3" +SRCREV = "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 = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "a53a28b971e3ae1a4a2baf7320ba60f5077f5596" +SRCREV = "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 = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "a14a1174cdc7ee2142abd33f85ea820eca90c968" +SRCREV = "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 = " \ DEPENDS += "qtbase" -SRCREV = "12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c" +SRCREV = "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() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "274f162fd41c4de88df7efda9e6ec16a1ca968bc" +SRCREV = "e8026ec6a30c5124c2e3162d9a17e9ae11fa4475" BBCLASSEXTEND =+ "native nativesdk" |