From 5832bf2747a70257eca5c443fd487532d62c90b3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 24 May 2018 18:16:16 +0000 Subject: qtbase: don't use thumb for armv[45] * it fails when building with gcc8 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 6bf42643..e8f967ec 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -173,6 +173,11 @@ deltask generate_qt_config_file XPLATFORM_toolchain-clang = "linux-oe-clang" XPLATFORM ?= "linux-oe-g++" +# Causes qdrawhelper.s: Error: unaligned opcodes detected in executable segment +# when building qtbase/5.6.3+gitAUTOINC+e6f8b072d2-r0/git/src/gui/painting/qdrawhelper.cpp +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + do_configure() { # Regenerate header files when they are included in source tarball # Otherwise cmake files don't set PRIVATE_HEADERS correctly -- cgit v1.2.3-54-g00ecf From b3502fbbc08813fe46a60c230611506e4636d9dc Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Oct 2018 10:10:14 +0300 Subject: qt5: Disable ltcg for host_build debug-prefix-map does not work correctly for static libraries when using ltcg, and since host_build compilations link agaist the libQt5Bootstrap.a library, it breaks source file packaging into debug packages. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 + recipes-qt/qt5/qtbase-native_git.bb | 1 + .../qtbase/0016-Disable-ltcg-for-host_build.patch | 26 ++++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 1 + 4 files changed, 29 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 02ee6077..d2a45288 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -40,6 +40,7 @@ SRC_URI += "\ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ + file://0016-Disable-ltcg-for-host_build.patch \ " # common for qtbase-native and nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index d4709013..c58c7f37 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -35,6 +35,7 @@ SRC_URI += "\ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ + file://0016-Disable-ltcg-for-host_build.patch \ " # common for qtbase-native and nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch new file mode 100644 index 00000000..8b961e60 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch @@ -0,0 +1,26 @@ +From 94383531bde019ba113cc416b5cf3627e18ffef3 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Tue, 23 Oct 2018 09:54:57 +0300 +Subject: [PATCH] Disable ltcg for host_build + +debug-prefix-map does not work correctly for static libraries +when using ltcg, and since host_build compilations link agaist +the libQt5Bootstrap.a library, it breaks source file packaging +into debug packages. + +Task-number: QTBUG-71230 +Upstream-Status: Inappropriate [embedded specific] +--- + mkspecs/features/ltcg.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf +index ccf0226272..482e5b573d 100644 +--- a/mkspecs/features/ltcg.prf ++++ b/mkspecs/features/ltcg.prf +@@ -1,4 +1,4 @@ +-CONFIG(release, debug|release) { ++CONFIG(release, debug|release):!host_build { + # We need fat object files when creating static libraries on some platforms + # so the linker will know to load a particular object from the library + # in the first place. On others, we have special ar and nm to create the symbol diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index e8f967ec..e5585cd0 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -31,6 +31,7 @@ SRC_URI += "\ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ + file://0016-Disable-ltcg-for-host_build.patch \ " -- cgit v1.2.3-54-g00ecf From 4ed43856587539ff18f2ff08de296541087e1e31 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 7 Oct 2018 22:31:15 +0200 Subject: qtbase: don't leak absolut path to recipe specific sysroot If the qtbase recipe-sysroot no longer exists (e.g. because of rm_work) a user of Qt5GuiConfigExtras.cmake will experience the following error: | ERROR: Task (.../meta-qt5/recipes-qt/qt5/qtwebkit_git.bb:do_configure) failed with exit code '1' | CMake Error in Source/WebCore/CMakeLists.txt: | Imported target "Qt5::Gui_EGL" includes non-existent path | | ".../build/tmp-glibc/work/armv7at2hf-neon-imx-angstrom-linux-gnueabi/qtbase/5.11.2+gitAUTOINC+49efea26a5-r0/recipe-sysroot/usr/include/libdrm" Signed-off-by: Max Krummenacher --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 + recipes-qt/qt5/qtbase-native_git.bb | 1 + ...gExtras.cmake.in-cope-with-variable-path-.patch | 69 ++++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 1 + 4 files changed, 72 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index d2a45288..863b4771 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -41,6 +41,7 @@ SRC_URI += "\ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ file://0016-Disable-ltcg-for-host_build.patch \ + file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ " # common for qtbase-native and nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index c58c7f37..26a6fc3e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -36,6 +36,7 @@ SRC_URI += "\ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ file://0016-Disable-ltcg-for-host_build.patch \ + file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ " # common for qtbase-native and nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch new file mode 100644 index 00000000..841d5080 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -0,0 +1,69 @@ +From cc017da9bb6936c6e147e8d416c8405493d4422c Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Sat, 27 Oct 2018 12:29:31 +0000 +Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to + sysroot + +EGL is configured to need an include path into the recipe-specific sysroot. +However users of the cmake file will have a different absolute path than that +used when creating the cmake file from cmake.in in qtbase. + +Change to store the relative path within the sysroot and then prepend the +currently used sysroot in the _qt5gui_find_extra_libs macro. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Max Krummenacher +--- + src/gui/Qt5GuiConfigExtras.cmake.in | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) + +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 07869efd7d..671aa82167 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) + + macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) + set(Qt5Gui_${Name}_LIBRARIES) +-!!IF !mac +- set(Qt5Gui_${Name}_INCLUDE_DIRS ${IncDirs}) +-!!ELSE ++ + foreach(_dir ${IncDirs}) +- if (EXISTS ${_dir}) +- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_dir}) +- else() +- find_path(_actual_dir ${_dir}) # Look in sdk directories +- if (_actual_dir) +- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) +- endif() +- unset(_actual_dir CACHE) ++ find_path(_actual_dir ${_dir}) ++ if (_actual_dir) ++ list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) + endif() ++ unset(_actual_dir CACHE) + endforeach() +-!!ENDIF ++ + foreach(_lib ${Libs}) + string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) + if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) +@@ -158,11 +152,11 @@ endmacro() + + + !!IF !isEmpty(CMAKE_EGL_LIBS) +-_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\") ++_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$replace(CMAKE_EGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") + !!ENDIF + + !!IF !isEmpty(CMAKE_OPENGL_LIBS) +-_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\") ++_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$replace(CMAKE_OPENGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") + + !!ENDIF + +-- +2.13.6 + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index e5585cd0..f26c3949 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -32,6 +32,7 @@ SRC_URI += "\ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ file://0016-Disable-ltcg-for-host_build.patch \ + file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ " -- cgit v1.2.3-54-g00ecf From 0edbe1ba0daa069fa68368c8e2f8b72883e4ca99 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 13 Nov 2018 10:39:21 +0000 Subject: qtbase: refresh patches and update tags on meta-qt5 Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 6 ++--- recipes-qt/qt5/qtbase-native_git.bb | 8 +++---- .../qtbase/0016-Always-build-uic-and-qvkgen.patch | 28 ---------------------- .../qtbase/0016-Disable-ltcg-for-host_build.patch | 2 +- .../0017-Bootstrap-without-linkat-feature.patch | 27 --------------------- ...gExtras.cmake.in-cope-with-variable-path-.patch | 5 +--- .../qtbase/0018-Always-build-uic-and-qvkgen.patch | 28 ++++++++++++++++++++++ .../0019-Bootstrap-without-linkat-feature.patch | 27 +++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 2 +- 9 files changed, 65 insertions(+), 68 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch create mode 100644 recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch create mode 100644 recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 863b4771..1da5753d 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.11 +# 5.11.meta-qt5-shared.12 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -46,9 +46,9 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.11 +# 5.11.meta-qt5-native.12 SRC_URI += " \ - file://0016-Always-build-uic-and-qvkgen.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 26a6fc3e..0d01c041 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.11 +# 5.11.meta-qt5-shared.12 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -41,14 +41,14 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.11 +# 5.11.meta-qt5-native.12 SRC_URI += " \ - file://0016-Always-build-uic-and-qvkgen.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0017-Bootstrap-without-linkat-feature.patch \ + file://0019-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch deleted file mode 100644 index 732e2fb7..00000000 --- a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7b5433027e9c75902b83a2990e09ae221d98451e Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH] Always build uic and qvkgen - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 1c76a2e46f..fbd4014fb3 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -232,7 +232,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch index 8b961e60..6d4e6968 100644 --- a/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch @@ -1,4 +1,4 @@ -From 94383531bde019ba113cc416b5cf3627e18ffef3 Mon Sep 17 00:00:00 2001 +From 3b9861c92444d50198ca74e60bcf10738998b7e9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Oct 2018 09:54:57 +0300 Subject: [PATCH] Disable ltcg for host_build diff --git a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index 66dc8404..00000000 --- a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 739dd4920bc16919c81c62bcddadc6958599792c Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 24 Nov 2017 15:16:31 +0200 -Subject: [PATCH] Bootstrap without linkat feature - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index c5585ea32a..de895e7bf4 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -90,7 +90,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif diff --git a/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index 841d5080..3460568c 100644 --- a/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -1,4 +1,4 @@ -From cc017da9bb6936c6e147e8d416c8405493d4422c Mon Sep 17 00:00:00 2001 +From a154d5f20d85108fcbf36f9f39cb853438f98127 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 27 Oct 2018 12:29:31 +0000 Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to @@ -64,6 +64,3 @@ index 07869efd7d..671aa82167 100644 !!ENDIF --- -2.13.6 - diff --git a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..d2d00be0 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From 531068a88afa3336455134d85c16934bb4002124 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH] Always build uic and qvkgen + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 1c76a2e46f..fbd4014fb3 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -232,7 +232,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..16923cd4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch @@ -0,0 +1,27 @@ +From 0d6a38d7bec0a3017a9e325f5e2b6e6168359b33 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 24 Nov 2017 15:16:31 +0200 +Subject: [PATCH] Bootstrap without linkat feature + +qmake does not work together with pseudo when unnamed temporary files +are used with linkat. + +Upstream-Status: Inappropriate [OE specific] +[YOCTO #11996] +--- + src/corelib/global/qconfig-bootstrapped.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index c5585ea32a..de895e7bf4 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -90,7 +90,7 @@ + #define QT_FEATURE_itemmodel -1 + #define QT_FEATURE_library -1 + #ifdef __linux__ +-# define QT_FEATURE_linkat 1 ++# define QT_FEATURE_linkat -1 + #else + # define QT_FEATURE_linkat -1 + #endif diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index f26c3949..f4c10a62 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.11 +# 5.11.meta-qt5-shared.12 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ -- cgit v1.2.3-54-g00ecf From 3fa199310a6bb42befeb2136d144054815d46bdf Mon Sep 17 00:00:00 2001 From: Christian Haettich Date: Sun, 11 Nov 2018 19:48:22 +0100 Subject: qtbase-native: disable postgresql support Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 0d01c041..660c27ae 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -69,6 +69,7 @@ PACKAGECONFIG_CONFARGS = " \ -no-gui \ -no-sql-mysql \ -no-sql-sqlite \ + -no-sql-psql \ -no-opengl \ -no-openssl \ -no-xcb \ -- cgit v1.2.3-54-g00ecf From fd1f0f47312e7ee80e5ca65b8b2992cb068b1656 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Thu, 4 Oct 2018 13:22:22 -0400 Subject: python-pyqt5: Update to 5.11.3 and add python3 recipe. Signed-off-by: Philip Balister Signed-off-by: Martin Jansa --- recipes-python/pyqt5/python-pyqt5.inc | 62 +++++++++++++++++++++++++ recipes-python/pyqt5/python-pyqt5_5.10.1.bb | 67 ---------------------------- recipes-python/pyqt5/python-pyqt5_5.11.3.bb | 8 ++++ recipes-python/pyqt5/python3-pyqt5_5.11.3.bb | 7 +++ 4 files changed, 77 insertions(+), 67 deletions(-) create mode 100644 recipes-python/pyqt5/python-pyqt5.inc delete mode 100644 recipes-python/pyqt5/python-pyqt5_5.10.1.bb create mode 100644 recipes-python/pyqt5/python-pyqt5_5.11.3.bb create mode 100644 recipes-python/pyqt5/python3-pyqt5_5.11.3.bb diff --git a/recipes-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc new file mode 100644 index 00000000..c5ff46cf --- /dev/null +++ b/recipes-python/pyqt5/python-pyqt5.inc @@ -0,0 +1,62 @@ +SUMMARY = "Python Qt5 Bindings" +AUTHOR = "Phil Thomson @ riverbank.co.uk" +HOMEPAGE = "http://riverbankcomputing.co.uk" +SECTION = "devel/python" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ +" +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "aac3428e90eca5df68c5764282fd9b98" +SRC_URI[sha256sum] = "c9b57d15601d436faf35dacf8e0acefa220194829a653e771e80b189b3261073" + +S = "${WORKDIR}/PyQt5_gpl-${PV}" + +inherit qmake5 +DEPENDS = "qtbase" + +export BUILD_SYS +export HOST_SYS +export STAGING_INCDIR +export STAGING_LIBDIR + +DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" + +DISABLED_FEATURES_append_arm = " PyQt_qreal_double" + +PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets" +PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets" + +do_configure_prepend() { + cd ${S} + echo "py_platform = linux" > pyqt.cfg + echo "py_inc_dir = %(sysroot)/$includedir/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg + echo "py_pylib_dir = %(sysroot)/${libdir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg + echo "py_pylib_lib = python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg + echo "pyqt_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}/site-packages" >> pyqt.cfg + echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg + echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg + echo "pyuic_interpreter = ${D}/${bindir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg + echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg + echo "qt_shared = True" >> pyqt.cfg + QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` + echo "[Qt $QT_VERSION]" >> pyqt.cfg + echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg + echo yes | ${PYTHON} configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} +} + +do_compile() { + cd ${S} + oe_runmake +} + +do_install() { + cd ${S} + oe_runmake install +} + +FILES_${PN} += "${libdir}/${PYTHON_DIR}${PYTHON_ABI}/site-packages ${datadir}/sip/PyQt5/" + +RDEPENDS_${PN} = "qtbase" diff --git a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb deleted file mode 100644 index 505db59d..00000000 --- a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "Python Qt5 Bindings" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -HOMEPAGE = "http://riverbankcomputing.co.uk" -SECTION = "devel/python" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "\ - file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ -" -DEPENDS = "sip sip-native qtbase python" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "be36c2abaffc9daa8b993f1ca982968f" -SRC_URI[sha256sum] = "9932e971e825ece4ea08f84ad95017837fa8f3f29c6b0496985fa1093661e9ef" - -S = "${WORKDIR}/PyQt5_gpl-${PV}" - - -inherit qmake5 pythonnative python-dir distro_features_check -# depends on qt4-x11-free -REQUIRED_DISTRO_FEATURES = "x11" - -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" - -DISABLED_FEATURES_append_arm = " PyQt_qreal_double" - -PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets" -PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets" - -do_configure_prepend() { - cd ${S} - echo "py_platform = linux" > pyqt.cfg - echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)" >> pyqt.cfg - echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg - echo "py_pylib_lib = python%(py_major).%(py_minor)mu" >> pyqt.cfg - echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg - echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg - echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg - echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg - echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg - echo "qt_shared = True" >> pyqt.cfg - QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` - echo "[Qt $QT_VERSION]" >> pyqt.cfg - echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg - echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} -} - -do_compile() { - cd ${S} - oe_runmake -} - -do_install() { - cd ${S} - oe_runmake install -} - -RDEPENDS_${PN} = "python-core python-sip qtbase" - -FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" - diff --git a/recipes-python/pyqt5/python-pyqt5_5.11.3.bb b/recipes-python/pyqt5/python-pyqt5_5.11.3.bb new file mode 100644 index 00000000..6b1b5701 --- /dev/null +++ b/recipes-python/pyqt5/python-pyqt5_5.11.3.bb @@ -0,0 +1,8 @@ +require python-pyqt5.inc + +inherit pythonnative python-dir + +DEPENDS += "sip sip-native python" + +RDEPENDS_${PN} += "python-core python-sip" + diff --git a/recipes-python/pyqt5/python3-pyqt5_5.11.3.bb b/recipes-python/pyqt5/python3-pyqt5_5.11.3.bb new file mode 100644 index 00000000..200a8154 --- /dev/null +++ b/recipes-python/pyqt5/python3-pyqt5_5.11.3.bb @@ -0,0 +1,7 @@ +require python-pyqt5.inc + +inherit python3native python3-dir + +DEPENDS += "sip3 sip3-native python3" + +RDEPENDS_${PN} += "python3-core python3-sip3" -- cgit v1.2.3-54-g00ecf From 4064b3b6ea53fb1ee1f9f96b06c6abe120b830f4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 30 Oct 2018 16:34:51 +0200 Subject: qtdeclarative: fix inconsistent QML_COMPILE_HASH value qtdeclarative and qtdeclarative-native may end up with different values for QML_COMPILE_HASH, which prevents running QML application when qtquickcompiler has been used. Change-Id: I29f42915629ca5da7507fdd20cfe0c64f445df9f Reviewed-by: Mikko Gronoff --- ...ways-use-commit-sha1-for-QML_COMPILE_HASH.patch | 31 ++++++++++++++++++++++ recipes-qt/qt5/qtdeclarative_git.bb | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch diff --git a/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch b/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch new file mode 100644 index 00000000..a734f8a2 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch @@ -0,0 +1,31 @@ +From 260e165993fe15a1668cfd36caee18a95b2d2f59 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Mon, 2 Jul 2018 13:32:44 +0300 +Subject: [PATCH] Always use commit sha1 for QML_COMPILE_HASH + +git describe can produce different strings for the same sha1, depending +on the version of git (length of short hash) and whether release tag was +in place when build was done (v5.11.1-0- vs. v5.11.0-66-). + +Instead use rev-parse to get the unambiguous commit sha1 which is also +what is used from the .tag file. + +Change-Id: If378f03eb764e2d858bda5b662106aa4402d6559 +Reviewed-by: Simon Hausmann +--- + src/qml/qml.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qml/qml.pro b/src/qml/qml.pro +index 940ebb325..a76a87b15 100644 +--- a/src/qml/qml.pro ++++ b/src/qml/qml.pro +@@ -31,7 +31,7 @@ DEFINES += QT_NO_FOREACH + !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") { + QML_COMPILE_HASH = $$tag + } else:exists($$PWD/../../.git) { +- commit = $$system(git describe --tags --always --long --dirty) ++ commit = $$system(git rev-parse HEAD) + QML_COMPILE_HASH = $$commit + } + compile_hash_contents = \ diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 39095e59..3cb0a602 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " +SRC_URI += "file://0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch" + DEPENDS += "qtbase" PACKAGECONFIG ??= "qtxmlpatterns qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" -- cgit v1.2.3-54-g00ecf From 6b354b933c526015c1c98e2334cdb29cb5e489e1 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 6 Nov 2018 15:43:17 +0200 Subject: qt5: update submodules Update to initial Qt 5.11.3 branch snapshot Task-number: QTBUG-71658 Change-Id: Ia4c945df724e2c3c68813aa7b3f210d2ff076647 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- ...-version-for-renameat2-statx-on-non-boots.patch | 16 +++++++-------- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- ...quickwebengineview_p_p.h-add-include-QCol.patch | 23 ---------------------- ...-dependency-to-QCoreApplication-translate.patch | 23 ---------------------- recipes-qt/qt5/qtwebengine_git.bb | 6 ++---- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 40 files changed, 46 insertions(+), 94 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index cf5b1300..51164286 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -194,4 +194,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 = "b0dce506cc91c4b623eb323db7bbc18469e721c2" +SRCREV = "c69f43594fc921fea82377e7b31a7f55f718051d" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a9035146..86d2d31d 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 = "d630e3c8a9ac291421f028873bd599f7a072dd65" +SRCREV = "d4835713b808503ab6d3039f3893355804a8a21d" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 7128301c..ca5e6b9a 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.11.2+git${SRCPV}" +PV = "5.11.3+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index c93a1cc2..973af628 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -136,4 +136,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 = "b0dce506cc91c4b623eb323db7bbc18469e721c2" +SRCREV = "c69f43594fc921fea82377e7b31a7f55f718051d" diff --git a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch index 0f1e1b30..b1684e3c 100644 --- a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch +++ b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch @@ -1,4 +1,4 @@ -From f63242fbcac990839eff2ce9f970377d6350fd8a Mon Sep 17 00:00:00 2001 +From cd9a12017597d9233b529be24434225da6db614e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 21 Aug 2018 00:29:06 +0200 Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped @@ -15,13 +15,14 @@ Signed-off-by: Andreas Müller 1 file changed, 11 insertions(+) diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index deb4a9f220..ecf23168e7 100644 +index 964dceb..c09eb01 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -97,6 +97,17 @@ extern "C" NSString *NSTemporaryDirectory(); +@@ -95,6 +95,17 @@ extern "C" NSString *NSTemporaryDirectory(); + #ifndef FICLONE # define FICLONE _IOW(0x94, 9, int) #endif - ++ +// renameat2/statx features for non bootstrapped build +#ifndef QT_BOOTSTRAPPED +#ifdef __GLIBC_PREREQ @@ -32,7 +33,6 @@ index deb4a9f220..ecf23168e7 100644 +# define QT_FEATURE_statx -1 +#endif +#endif -+ - # if defined(Q_OS_ANDROID) - // renameat2() and statx() are disabled on Android because quite a few systems - // come with sandboxes that kill applications that make system calls outside a + #endif + + #if defined(Q_OS_ANDROID) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 6e29a430..60ed2971 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -252,4 +252,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "b0dce506cc91c4b623eb323db7bbc18469e721c2" +SRCREV = "c69f43594fc921fea82377e7b31a7f55f718051d" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index b6d89629..229fcbbf 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 = "f1a2bd81052802a2a762051066b724f1444df3ed" +SRCREV = "6f0a1143a55a4e19d14bf999c4e3a2ad5c7fa313" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 2cf9067a..ab0fe39d 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 = "29cfc9869349b83227452adc021273cde5857c91" +SRCREV = "1bf73796a92ccd1599e5c762b73a76e545e48262" # 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 f7d2d2fe..da0b9259 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "8b70dcb210d82a55220c0a953653646a91d55251" +SRCREV = "d1cf8dad0e6d8d08b5c6f2f08d85a0e75b0bcf8a" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index d6b5d050..02b9ff6b 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 = "2927c2509a2907be505a94600485d5e83c89431b" +SRCREV = "7b091d13ed5509a73da921a7ed30034a7eb55131" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 3cb0a602..9ecadb92 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -35,6 +35,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "0431e462dff57bc6a9010649c0d7f153d91cab2d" +SRCREV = "7eaa93680ce583354f23f3b29bd6db59169dfece" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 380af675..21b26858 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 = "4bac917db87046017485a4758d4b9d8e6a50528b" +SRCREV = "e542b1b6c46e49baec66d427a2664cc2c6aefa01" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index fc2fa331..e6c1c953 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 = "43d951c802f348c61ede03059c38bcb262e9e7f7" +SRCREV = "7e2544e28cac2fbf7176b6692dacc57096774249" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index d6614fb2..fda15241 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "529f5854c1bba36befba984b1a066d3b77689f12" +SRCREV = "2f61f401187d55bb0304591f27792a63a38db00e" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 075ea222..ca9a75b5 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 = "6d56b2295f377df4b7fc19543a496fa22b30c7d9" +SRCREV_qtlocation = "25c6840ff6585ca9f7ab1c168cdcdd18a68c7885" SRCREV_qtlocation-mapboxgl = "b59b0450c60b3df9e0852f62f6c8a6024889cd9e" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 2c84828d..d86903e7 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 = "320a109d19a515eec370761c8ccb0a83d4e1de2f" +SRCREV = "d9bf568551c9e101374ba842e831650d34d0d41e" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index dfaceab9..c2968305 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 = "d17cc152085f664c9e8a381d6be18af42c619108" +SRCREV = "ffb63277ac2ac90b4a99a710660d5e66920a8c5a" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 2c581b2d..0fc53360 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 = "cfeaf0be6c7869b15c87b83632be7eeebf76e0f9" +SRCREV = "d7257f75e1e9f89a2934c50784d76d90f919605f" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index c0305b35..1f72fda4 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 = "4ba4b944686f3b2314dd26a56180d56c04d8b5bb" +SRCREV = "d56c193eb4ceb640611d66f22e1f26aae91cd7d1" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index c333b9c8..591f3979 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 = "6ffa877a646e694743173d381e8bd1d2c9d45d68" +SRCREV = "cf957e407030fc260bd86882cf2f79724126abdd" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 60d0fb72..8675b9d4 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 = "fc13d3dbe5570d689f1bb84094a340096da721db" +SRCREV = "9fcf2a90db6d6dce1fe03a2f7af4c4a148c35087" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 7ae471c6..496a7792 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -37,4 +37,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 = "b5f10e499754d57bde490f663a1edf63b4e1bcdc" +SRCREV = "ebe11c8e867bb65ad7cb1424fe4c096935741089" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index bbef3da9..9cb028f3 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 = "9cfd49dbb3b6a3a173dff4d83129bf96fdcea609" +SRCREV = "a5effbcb0372020f5ce3134a4f38eb865fd6cdd6" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 # 5.11.meta-qt5.5 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 383c9d95..b489c35e 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 = "b4634741fd94dac837418fd5e4f6e1c75bb29a22" +SRCREV = "a4c3631b0bb895b854305ecf2a4632dc949ef2d3" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 073dd45d..343f2684 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 = "e9680f774fcd018842414734d1a6544ec366bf78" +SRCREV = "200822ca61732693cc97802b953cd846654eb319" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 480e8b7f..eed68e87 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 = "d8a92d2ca965f5a9afccba0fb7b7f49d026820d4" +SRCREV = "74222a0e38687068970c8492d794cf92b898c6b6" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 3da33beb..30a6b79f 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "6ddd60feae4f05ddf179f879b168656538ddb2ef" +SRCREV = "a844c1c36551665f19be8a69c0e5e608d24f3a8e" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 562b9e24..822ceae7 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 = "277af20762813ff92ea47a69b4d18563e01cc18e" +SRCREV = "ab73d888c4f41a0d0993abca18680cdcbd79b444" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 08008a09..6689ab14 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -103,4 +103,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "60de15a0e0121096239cf6031250d2862e77971d" +SRCREV = "ed5110171ca294207f341f46610c716170c06282" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 1ce0a657..a17ee4e1 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 = "c8f5d466bcda37174a3f3d5acbf4db2eb9c29bb1" +SRCREV = "eb9e095722e1d953d3bf17bad73f528ac9061488" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index ec0406ca..dd616c06 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "0a6e1ddf708c47b3d19c1418630076e14021e49c" +SRCREV = "dccec9b282ae15fa65fd61698dd1cb47325e5c8e" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index efa84341..cb19a421 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 = "3994950f0d0065a4579b6bfe738702a6daeead96" +SRCREV = "faab35b4f88c634510e56adcfa6f12f0fef548bb" diff --git a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch deleted file mode 100644 index d0e9679f..00000000 --- a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 50a92a60b04d0e6253a903a53f5b01da2d00072d Mon Sep 17 00:00:00 2001 -From: Cleiton Bueno -Date: Fri, 25 Dec 2015 18:16:05 -0200 -Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor - -Signed-off-by: Cleiton Bueno ---- - src/webengine/api/qquickwebengineview_p_p.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h -index 1723da7e..4d9e5981 100644 ---- a/src/webengine/api/qquickwebengineview_p_p.h -+++ b/src/webengine/api/qquickwebengineview_p_p.h -@@ -61,6 +61,8 @@ - #include - #include - #include -+#include -+ - - namespace QtWebEngineCore { - class WebContentsAdapter; diff --git a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch deleted file mode 100644 index 0467d97a..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d61b28affb7d895e12dfa0e0390c488ec3b2a1f8 Mon Sep 17 00:00:00 2001 -From: Cleiton Bueno -Date: Thu, 24 Dec 2015 15:59:51 -0200 -Subject: [PATCH] Include dependency to QCoreApplication::translate() - -Signed-off-by: Cleiton Bueno ---- - src/core/media_capture_devices_dispatcher.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h -index 579d159a..0904c468 100644 ---- a/src/core/media_capture_devices_dispatcher.h -+++ b/src/core/media_capture_devices_dispatcher.h -@@ -45,6 +45,8 @@ - #include - #include - -+#include -+ - #include "web_contents_adapter_client.h" - - #include "base/callback.h" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 7c30c688..0822e858 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -139,8 +139,6 @@ QT_MODULE_BRANCH_CHROMIUM = "65-based" # 5.11.meta-qt5.7 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ - file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ - file://0002-Include-dependency-to-QCoreApplication-translate.patch \ file://0003-Force-host-toolchain-configuration.patch \ file://0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \ " @@ -174,8 +172,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "6426f1e93622cb08a2286705398e7762cbcd0a45" -SRCREV_chromium = "7085115f51ce9d02cfff216a3f74b1fb6715f38d" +SRCREV_qtwebengine = "97687f9bdf9eba7ce06f0813f6df3e9ed65e95d5" +SRCREV_chromium = "33fd7a21ed794e4d89062b9153ff714e642773ff" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 1df01552..749b95a2 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 = "4f1c8aa8fcc60ca7eef5f92d4e920b065336ffd0" +SRCREV = "4519f09577e76c6c0f6cc7ca4c0a5a78174bc4a9" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 1134a63a..61855612 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 = "10ce467a825f2de5a5cb934c4ef21e76f8840a07" +SRCREV = "bac5a37663249edb9a9746687a7128c013af0309" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index fc884911..d4ff9f6d 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 = "4c1918c99db5bcb3c95e777df2f6886f46b0336b" +SRCREV = "8970865f64bc4f02ad110c0ad1d9bbd8e949a4d9" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 082d3bf4..2102b898 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 = "131aa9037dd93595473bc7277123fbc3360ae15b" +SRCREV = "25abe51f8455fbdaab9d6c4bcb6c8ce7b45f5e13" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 7b61d2c2..b27d2ec5 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "bb3d518fea63cc834fe2b5654c3ac8bf7d2771f6" +SRCREV = "af06f4fbf76ef6168529f5de4480d4afd2cf204b" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf