diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-07-03 15:01:08 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-07-15 13:58:40 +0000 |
commit | 8d2e1b401987d743ebdf964927c03f41e8f60328 (patch) | |
tree | d002364505c85ecb0a508dc359156c4444ffeaed | |
parent | 8da88b098fae46e13cd7cbaf8d65dd0e99b4e0e5 (diff) |
qt5: Upgrade to Qt 5.13.0
Update recipes for Qt 5.13.0, add new recipes for Qt modules qtcoap
and qtlottie, and remove qtcanvas3d.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
51 files changed, 136 insertions, 592 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 020ada23..1727fbb9 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -41,7 +41,6 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0017-Fix-Wdeprecated-copy-warnings.patch \ " # common for qtbase-native and nativesdk-qtbase @@ -194,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 = "b527725766df850fcad6b9078fea5e8da8085560" +SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" 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 b1e662bc..05a86a70 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,26 +1,24 @@ -From 98509dbb66b3d93cdb6ca73cb5db537fa8ff8bd3 Mon Sep 17 00:00:00 2001 +From 1e64f9b509e6794c6f01e62443e93f771ac2a65c 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 | 9 +++++++-- + qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- - tools/tools.pro | 2 +- + tools/tools.pro | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index 847507f17..286286dd0 100644 +index d5dbda4..6809470 100644 --- a/qt3d.pro +++ b/qt3d.pro -@@ -1,5 +1,5 @@ --requires(qtHaveModule(gui)) --requires(qtConfig(opengl):!wasm) -+!tools-only:requires(qtHaveModule(gui)) -+!tools-only:requires(qtConfig(opengl):!wasm) +@@ -1,4 +1,4 @@ +-qtHaveModule(gui): \ ++!tools-only:qtHaveModule(gui): \ + requires(qtConfig(opengl):!wasm) CONFIG += examples_need_tools - load(qt_parts) @@ -15,3 +15,8 @@ load(qt_parts) OTHER_FILES += \ @@ -31,7 +29,7 @@ index 847507f17..286286dd0 100644 + SUBDIRS = sub_tools +} diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri -index 8ba2d9a41..e973d93dd 100644 +index 8ba2d9a..e973d93 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -1,5 +1,5 @@ @@ -42,11 +40,16 @@ index 8ba2d9a41..e973d93dd 100644 } else { include(assimp.pri) diff --git a/tools/tools.pro b/tools/tools.pro -index 121507613..24c49ad5a 100644 +index 3b457ed..9f5376a 100644 --- a/tools/tools.pro +++ b/tools/tools.pro -@@ -1,5 +1,5 @@ +@@ -1,9 +1,9 @@ TEMPLATE = subdirs + +-!qtHaveModule(3dcore): \ ++!tools-only:!qtHaveModule(3dcore): \ + return() + QT_FOR_CONFIG += 3dcore-private -qtConfig(assimp):qtConfig(commandlineparser): { +tools-only|qtConfig(assimp):qtConfig(commandlineparser): { diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index bcc63058..25681f53 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 = "7da5c4c35a657ea43663b4ed0d65e896b8db5c69" +SRCREV = "7640c5d526d10e0397e9f2e712139433165d269f" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 1866f3e5..61bd9ea9 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -2,7 +2,7 @@ # Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com> QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.12" +QT_MODULE_BRANCH ?= "5.13" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" # each module needs to define valid SRCREV @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.12.3+git${SRCPV}" +PV = "5.13.0+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 516315e5..9f03556a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -36,7 +36,6 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0017-Fix-Wdeprecated-copy-warnings.patch \ " # common for qtbase-native and nativesdk-qtbase @@ -142,4 +141,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 = "b527725766df850fcad6b9078fea5e8da8085560" +SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 4d90c772..155dd63c 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 406ea336ac2a1bc7dac055c378303f27b8a20c2d Mon Sep 17 00:00:00 2001 +From 0edb35edfc5ef383e705b50422796dbd5ba8ef1a Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -21,17 +21,17 @@ Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- configure | 2 +- - mkspecs/features/configure.prf | 4 +-- - mkspecs/features/qt.prf | 6 ++--- + mkspecs/features/configure.prf | 4 ++-- + mkspecs/features/qt.prf | 6 +++--- mkspecs/features/qt_functions.prf | 2 +- - mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + 6 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index ef7bad1bfc..dcca0f9135 100755 +index ef7bad1..dcca0f9 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ fi @@ -44,7 +44,7 @@ index ef7bad1bfc..dcca0f9135 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 934a18a924..0f5b1b6333 100644 +index 934a18a..0f5b1b6 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { @@ -65,19 +65,19 @@ index 934a18a924..0f5b1b6333 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index d8d5acaafd..57d11420c2 100644 +index 3a71376..dd6020f 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { - !isEmpty(plug_type) { +@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { + plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) isEmpty(plug_path): \ - plug_path = $$[QT_INSTALL_PLUGINS/get] + plug_path = $$[QT_INSTALL_PLUGINS] - LIBS += -L$$plug_path/$$plug_type - } - LIBS += -l$${plug}$$qtPlatformTargetSuffix() -@@ -277,8 +277,8 @@ for(ever) { + LIBS += $$plug_path/$$plug_type/$$plug_name + } else { + LIBS += -l$${plug}$$qtPlatformTargetSuffix() +@@ -271,8 +271,8 @@ for(ever) { # static builds: link qml import plugins into the target. contains(all_qt_module_deps, qml): \ qtConfig(static):import_plugins:!host_build:!no_import_scan { @@ -89,7 +89,7 @@ index d8d5acaafd..57d11420c2 100644 # run qmlimportscanner qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..c093dd4592 100644 +index 1903e50..c093dd4 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -103,7 +103,7 @@ index 1903e509c8..c093dd4592 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..c202c47fa1 +index 0000000..c202c47 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,39 @@ @@ -148,7 +148,7 @@ index 0000000000..c202c47fa1 +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -index 0000000000..5d22fb4101 +index 0000000..5d22fb4 --- /dev/null +++ b/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1 @@ diff --git a/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch b/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch deleted file mode 100644 index a5c4bd32..00000000 --- a/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch +++ /dev/null @@ -1,371 +0,0 @@ -From 3b92a70c05eebc645d83c5570dac0285f612c039 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Tue, 13 Nov 2018 17:14:43 +0100 -Subject: [PATCH] Fix -Wdeprecated-copy warnings - -Implicit copy constructors or methods are considered deprecated for -classes that has one of the two or a destructor. - -The warning is enabled with -Wextra in gcc 9 - -Change-Id: Ic9be654f2a142fb186a4d5a7d6b4f7d6f4e611d8 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - -Upstream-Status: Backport from 5.13 - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - mkspecs/features/qt_common.prf | 19 ++++++------------- - src/corelib/io/qprocess_p.h | 3 +-- - src/corelib/kernel/qvariant.h | 5 ++++- - src/corelib/tools/qbytearraylist.h | 2 +- - src/corelib/tools/qlist.h | 6 +++++- - src/corelib/tools/qstringlist.h | 2 +- - src/gui/painting/qtriangulator_p.h | 2 ++ - src/gui/text/qtextobject.h | 1 + - src/widgets/styles/qstyleoption.h | 23 +++++++++++++++++++++++ - 9 files changed, 44 insertions(+), 19 deletions(-) - -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 6cb2e78c1c..1cf2d45168 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -89,14 +89,8 @@ clang { - greaterThan(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS_WARN_ON += -Wshift-overflow=2 -Wduplicated-cond - # GCC 7 has a lot of false positives relating to this, so disable completely - greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-stringop-overflow -- # GCC 9 has a lot of false positives relating to this, so disable completely -- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy -- # GCC 9 introduced this -- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-redundant-move -- # GCC 9 introduced this -+ # GCC 9 introduced -Wformat-overflow in -Wall, but it is buggy: - greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow -- # GCC 9 introduced this -- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-init-list-lifetime - } - - warnings_are_errors:warning_clean { -@@ -136,14 +130,13 @@ warnings_are_errors:warning_clean { - - # GCC 7 includes -Wimplicit-fallthrough in -Wextra, but Qt is not yet free of implicit fallthroughs. - greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=implicit-fallthrough -- # GCC 9 has a lot of false positives relating to this, so disable completely -- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy -+ # GCC 9 introduced -Wdeprecated-copy in -Wextra, but we are not clean for it. -+ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=deprecated-copy - # GCC 9 introduced this -- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-redundant-move -+ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=redundant-move - # GCC 9 introduced this -- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow -- # GCC 9 introduced this -- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-init-list-lifetime -+ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=init-list-lifetime -+ - # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135 - android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix - } -diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h -index aa7ecbe91d..eb2d1ed048 100644 ---- a/src/corelib/io/qprocess_p.h -+++ b/src/corelib/io/qprocess_p.h -@@ -108,8 +108,7 @@ using QProcEnvKey = QByteArray; - class QProcEnvValue - { - public: -- QProcEnvValue() {} -- QProcEnvValue(const QProcEnvValue &other) { *this = other; } -+ QProcEnvValue() = default; - explicit QProcEnvValue(const QString &value) : stringValue(value) {} - explicit QProcEnvValue(const QByteArray &value) : byteValue(value) {} - bool operator==(const QProcEnvValue &other) const -diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h -index ff73c27b6e..2394dc58f8 100644 ---- a/src/corelib/kernel/qvariant.h -+++ b/src/corelib/kernel/qvariant.h -@@ -396,10 +396,13 @@ class Q_CORE_EXPORT QVariant - : type(variantType), is_shared(false), is_null(false) - {} - -- inline Private(const Private &other) Q_DECL_NOTHROW -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -+ Private(const Private &other) Q_DECL_NOTHROW - : data(other.data), type(other.type), - is_shared(other.is_shared), is_null(other.is_null) - {} -+ Private &operator=(const Private &other) Q_DECL_NOTHROW = default; -+#endif - union Data - { - char c; -diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/tools/qbytearraylist.h -index ed014dd157..3b5266492f 100644 ---- a/src/corelib/tools/qbytearraylist.h -+++ b/src/corelib/tools/qbytearraylist.h -@@ -66,7 +66,7 @@ template <> struct QListSpecialMethods<QByteArray> - { - #ifndef Q_QDOC - protected: -- ~QListSpecialMethods() {} -+ ~QListSpecialMethods() = default; - #endif - public: - inline QByteArray join() const -diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h -index 49ccbc9c9f..1e77b08a15 100644 ---- a/src/corelib/tools/qlist.h -+++ b/src/corelib/tools/qlist.h -@@ -72,7 +72,7 @@ template <typename T> class QSet; - template <typename T> struct QListSpecialMethods - { - protected: -- ~QListSpecialMethods() {} -+ ~QListSpecialMethods() = default; - }; - template <> struct QListSpecialMethods<QByteArray>; - template <> struct QListSpecialMethods<QString>; -@@ -237,6 +237,8 @@ public: - // can't remove it in Qt 5, since doing so would make the type trivial, - // which changes the way it's passed to functions by value. - inline iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i){} -+ inline iterator &operator=(const iterator &o) Q_DECL_NOTHROW -+ { i = o.i; return *this; } - #endif - inline T &operator*() const { return i->t(); } - inline T *operator->() const { return &i->t(); } -@@ -290,6 +292,8 @@ public: - // can't remove it in Qt 5, since doing so would make the type trivial, - // which changes the way it's passed to functions by value. - inline const_iterator(const const_iterator &o) Q_DECL_NOTHROW : i(o.i) {} -+ inline const_iterator &operator=(const const_iterator &o) Q_DECL_NOTHROW -+ { i = o.i; return *this; } - #endif - #ifdef QT_STRICT_ITERATORS - inline explicit const_iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i) {} -diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h -index 10cbad04d6..693cfe30c4 100644 ---- a/src/corelib/tools/qstringlist.h -+++ b/src/corelib/tools/qstringlist.h -@@ -66,7 +66,7 @@ template <> struct QListSpecialMethods<QString> - { - #ifndef Q_QDOC - protected: -- ~QListSpecialMethods() {} -+ ~QListSpecialMethods() = default; - #endif - public: - inline void sort(Qt::CaseSensitivity cs = Qt::CaseSensitive); -diff --git a/src/gui/painting/qtriangulator_p.h b/src/gui/painting/qtriangulator_p.h -index 8f043fc925..c9ae2571f4 100644 ---- a/src/gui/painting/qtriangulator_p.h -+++ b/src/gui/painting/qtriangulator_p.h -@@ -93,6 +93,8 @@ public: - return indices16.size(); - } - -+ QVertexIndexVector() = default; -+ QVertexIndexVector(const QVertexIndexVector &other) = default; - inline QVertexIndexVector &operator = (const QVertexIndexVector &other) - { - if (t == UnsignedInt) -diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h -index 067f8473ea..694eb729d5 100644 ---- a/src/gui/text/qtextobject.h -+++ b/src/gui/text/qtextobject.h -@@ -263,6 +263,7 @@ public: - iterator() : p(nullptr), b(0), e(0), n(0) {} - #if QT_VERSION < QT_VERSION_CHECK(6,0,0) - iterator(const iterator &o) : p(o.p), b(o.b), e(o.e), n(o.n) {} -+ iterator &operator=(const iterator &o) = default; - #endif - - QTextFragment fragment() const; -diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h -index 8ae07efc81..763575ff5b 100644 ---- a/src/widgets/styles/qstyleoption.h -+++ b/src/widgets/styles/qstyleoption.h -@@ -118,6 +118,7 @@ public: - - QStyleOptionFocusRect(); - QStyleOptionFocusRect(const QStyleOptionFocusRect &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionFocusRect &operator=(const QStyleOptionFocusRect &other) = default; - - protected: - QStyleOptionFocusRect(int version); -@@ -142,6 +143,7 @@ public: - - QStyleOptionFrame(); - QStyleOptionFrame(const QStyleOptionFrame &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionFrame &operator=(const QStyleOptionFrame &other) = default; - - protected: - QStyleOptionFrame(int version); -@@ -171,6 +173,7 @@ public: - QStyleOptionTabWidgetFrame(); - inline QStyleOptionTabWidgetFrame(const QStyleOptionTabWidgetFrame &other) - : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionTabWidgetFrame &operator=(const QStyleOptionTabWidgetFrame &other) = default; - - protected: - QStyleOptionTabWidgetFrame(int version); -@@ -194,6 +197,7 @@ public: - - QStyleOptionTabBarBase(); - QStyleOptionTabBarBase(const QStyleOptionTabBarBase &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionTabBarBase &operator=(const QStyleOptionTabBarBase &other) = default; - - protected: - QStyleOptionTabBarBase(int version); -@@ -225,6 +229,7 @@ public: - - QStyleOptionHeader(); - QStyleOptionHeader(const QStyleOptionHeader &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionHeader &operator=(const QStyleOptionHeader &other) = default; - - protected: - QStyleOptionHeader(int version); -@@ -247,6 +252,7 @@ public: - - QStyleOptionButton(); - QStyleOptionButton(const QStyleOptionButton &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionButton &operator=(const QStyleOptionButton &other) = default; - - protected: - QStyleOptionButton(int version); -@@ -284,6 +290,7 @@ public: - - QStyleOptionTab(); - QStyleOptionTab(const QStyleOptionTab &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionTab &operator=(const QStyleOptionTab &other) = default; - - protected: - QStyleOptionTab(int version); -@@ -314,6 +321,7 @@ public: - int midLineWidth; - QStyleOptionToolBar(); - QStyleOptionToolBar(const QStyleOptionToolBar &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionToolBar &operator=(const QStyleOptionToolBar &other) = default; - - protected: - QStyleOptionToolBar(int version); -@@ -341,6 +349,7 @@ public: - - QStyleOptionProgressBar(); - QStyleOptionProgressBar(const QStyleOptionProgressBar &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionProgressBar &operator=(const QStyleOptionProgressBar &other) = default; - - protected: - QStyleOptionProgressBar(int version); -@@ -371,6 +380,7 @@ public: - - QStyleOptionMenuItem(); - QStyleOptionMenuItem(const QStyleOptionMenuItem &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionMenuItem &operator=(const QStyleOptionMenuItem &other) = default; - - protected: - QStyleOptionMenuItem(int version); -@@ -390,6 +400,7 @@ public: - - QStyleOptionDockWidget(); - QStyleOptionDockWidget(const QStyleOptionDockWidget &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionDockWidget &operator=(const QStyleOptionDockWidget &other) = default; - - protected: - QStyleOptionDockWidget(int version); -@@ -441,6 +452,7 @@ public: - - QStyleOptionViewItem(); - QStyleOptionViewItem(const QStyleOptionViewItem &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionViewItem &operator=(const QStyleOptionViewItem &other) = default; - - protected: - QStyleOptionViewItem(int version); -@@ -471,6 +483,7 @@ public: - - QStyleOptionToolBox(); - QStyleOptionToolBox(const QStyleOptionToolBox &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionToolBox &operator=(const QStyleOptionToolBox &other) = default; - - protected: - QStyleOptionToolBox(int version); -@@ -490,6 +503,7 @@ public: - - QStyleOptionRubberBand(); - QStyleOptionRubberBand(const QStyleOptionRubberBand &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionRubberBand &operator=(const QStyleOptionRubberBand &other) = default; - - protected: - QStyleOptionRubberBand(int version); -@@ -508,6 +522,7 @@ public: - - QStyleOptionComplex(int version = QStyleOptionComplex::Version, int type = SO_Complex); - QStyleOptionComplex(const QStyleOptionComplex &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionComplex &operator=(const QStyleOptionComplex &other) = default; - }; - - #if QT_CONFIG(slider) -@@ -532,6 +547,7 @@ public: - - QStyleOptionSlider(); - QStyleOptionSlider(const QStyleOptionSlider &other) : QStyleOptionComplex(Version, Type) { *this = other; } -+ QStyleOptionSlider &operator=(const QStyleOptionSlider &other) = default; - - protected: - QStyleOptionSlider(int version); -@@ -551,6 +567,7 @@ public: - - QStyleOptionSpinBox(); - QStyleOptionSpinBox(const QStyleOptionSpinBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } -+ QStyleOptionSpinBox &operator=(const QStyleOptionSpinBox &other) = default; - - protected: - QStyleOptionSpinBox(int version); -@@ -578,6 +595,7 @@ public: - - QStyleOptionToolButton(); - QStyleOptionToolButton(const QStyleOptionToolButton &other) : QStyleOptionComplex(Version, Type) { *this = other; } -+ QStyleOptionToolButton &operator=(const QStyleOptionToolButton &other) = default; - - protected: - QStyleOptionToolButton(int version); -@@ -600,6 +618,7 @@ public: - - QStyleOptionComboBox(); - QStyleOptionComboBox(const QStyleOptionComboBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } -+ QStyleOptionComboBox &operator=(const QStyleOptionComboBox &other) = default; - - protected: - QStyleOptionComboBox(int version); -@@ -618,6 +637,7 @@ public: - - QStyleOptionTitleBar(); - QStyleOptionTitleBar(const QStyleOptionTitleBar &other) : QStyleOptionComplex(Version, Type) { *this = other; } -+ QStyleOptionTitleBar &operator=(const QStyleOptionTitleBar &other) = default; - - protected: - QStyleOptionTitleBar(int version); -@@ -638,6 +658,7 @@ public: - - QStyleOptionGroupBox(); - QStyleOptionGroupBox(const QStyleOptionGroupBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } -+ QStyleOptionGroupBox &operator=(const QStyleOptionGroupBox &other) = default; - protected: - QStyleOptionGroupBox(int version); - }; -@@ -652,6 +673,7 @@ public: - - QStyleOptionSizeGrip(); - QStyleOptionSizeGrip(const QStyleOptionSizeGrip &other) : QStyleOptionComplex(Version, Type) { *this = other; } -+ QStyleOptionSizeGrip &operator=(const QStyleOptionSizeGrip &other) = default; - protected: - QStyleOptionSizeGrip(int version); - }; -@@ -668,6 +690,7 @@ public: - - QStyleOptionGraphicsItem(); - QStyleOptionGraphicsItem(const QStyleOptionGraphicsItem &other) : QStyleOption(Version, Type) { *this = other; } -+ QStyleOptionGraphicsItem &operator=(const QStyleOptionGraphicsItem &other) = default; - static qreal levelOfDetailFromTransform(const QTransform &worldTransform); - protected: - QStyleOptionGraphicsItem(int version); diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index c1f6cfba..b4ccca86 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -32,7 +32,6 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0017-Fix-Wdeprecated-copy-warnings.patch \ " # for syncqt @@ -294,4 +293,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "b527725766df850fcad6b9078fea5e8da8085560" +SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb deleted file mode 100644 index de5655d3..00000000 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ /dev/null @@ -1,14 +0,0 @@ -require qt5.inc -require qt5-git.inc - -LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = " \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ -" - -DEPENDS = "qtdeclarative" - -SRCREV = "e722ccfe62f2745b2da3b8b1202f8d224c3e5a5f" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index bde9f40e..b289914b 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 = "dcc4fd4fe0aff770204272d04749184df133bbb2" +SRCREV = "7c50ad366e8e40996a3b75a31b9834f6f667bde6" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb new file mode 100644 index 00000000..db0bb8e6 --- /dev/null +++ b/recipes-qt/qt5/qtcoap_git.bb @@ -0,0 +1,14 @@ +require qt5.inc +require qt5-git.inc + +LICENSE = "GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = " \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ +" + +PACKAGECONFIG ?= "qtdeclarative" +PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" + +DEPENDS += "qtbase" + +SRCREV = "18289e7c1d2778460dccb1135fe283bd234954ad" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 00c161d3..5a93d066 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,bluez5" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "9a77336d4984875d95f48b20a521c34f742e0fa7" +SRCREV = "8f2d6640f959e35a8fd033a50aa57cb13b673cbb" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index e9252f33..78de05b3 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 = "4672b6d2c725a74d482a76d6624671ae3a2ba2a1" +SRCREV = "cc7f4769a02421575c9f5a61d9b3687af79201dd" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 41481b4c..9d06377d 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 = "95c938cd67a1f9ccaf5a3a5fd40993f619786ca9" +SRCREV = "ecc092fa5519e77a47ef560f0137b4cd5f417c5e" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 2a142ece..a130c86e 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 = "48eeb8adf8ccf9eef284b7c6406708bf724f3652" +SRCREV = "7d610c6b1a437235cba38848c1af9afd5556dc73" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 8ba59471..973a2b7a 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 = "9c70295220c6dc7f8b4ba8d8406084129e317a6f" +SRCREV = "417dff666bd5a9e5a09b67780b0ffa8a496cbe92" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 75442663..d1905873 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 = "5e433bcefaebb8dac20edb96170349f9a0adde5d" +SRCREV = "a743e1427b4ce9b4f1c43d3456679c09cee7b4e0" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index ead1b19b..5544c62f 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 = "0dfc76b080df56ef1638bd6a9deb7325692bc242" +SRCREV = "4443f12461fc9cab42f4229454a390bd9e1ec4a4" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 6b09db4c..d8caaf2b 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -36,7 +36,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 = "cbcff2b083df51fb96f38cd64446f4e5afb3b2d1" +SRCREV_qtlocation = "667af08a388ffc3441adc5b8e73f2f8797b274c5" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb new file mode 100644 index 00000000..541ca55f --- /dev/null +++ b/recipes-qt/qt5/qtlottie_git.bb @@ -0,0 +1,12 @@ +require qt5.inc +require qt5-git.inc + +LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = " \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ +" + +DEPENDS += "qtbase qtdeclarative" + +SRCREV = "553ec1bc799f344a12e34c91720e13a469d85365" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index d83ce919..af28b74b 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 = "6281dd7e375f94a5e7f78055c0bebba93a2b0e02" +SRCREV = "72257654cc6f065f64c9218864e1be5f66738e8a" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 30f9c9e4..b24f2a4c 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 = "64981aee3bbbe2c4f5503b458636a84df822b0ec" +SRCREV = "f5c4fdd1f57bfbcb0a286ca10de5f6d5d0e47047" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 849feeb9..a63a29e8 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 = "5c9251aebb487a6c328f2d706002ca2039aff5ac" +SRCREV = "8bc01cbfe15843ab0ea6e9b9731c4eab83dec1ab" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index a86abbca..b7bdd4ec 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -1,18 +1,21 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" +LICENSE = "( GFDL-1.3 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial ) & MPL-2.0 & CC0-1.0" LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ " +PACKAGECONFIG ?= "qtdeclarative" +PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" + # 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 = "" -DEPENDS += "qtbase qtdeclarative" +DEPENDS += "qtbase" -SRCREV = "56d2b5df55c9a6ea7d21f3412193903f2504249e" +SRCREV = "3a75d0ac951d9ef165d1f33e9812be9346a6c1f4" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 0750fe68..846e6eda 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 = "aa924c0575c54c93a5b95ace4083c34f309a16d0" +SRCREV = "d7b00a49803412caf6a0b415974ff2f4c3adf7f7" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index d41c4b3a..73f9c3d7 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 = "f7ba074ca19f5f3d2d7580616144c65f35b48072" +SRCREV = "ea80013b2e990c8c28a9dfe7d6afaaa250bf2402" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index d7d9170f..a5228fbd 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 = "3a5ac4885b4818489120e9b46c208737ad202fb6" +SRCREV = "5f7e823d67e615727c8e36aafc6baadfc105c67f" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index d4fd74cc..5e6d6bdc 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 = "db1e447c46062946e57d7de9c0e0ea5fddc997f6" +SRCREV = "e7b07a60408285128dedb373316801294ca941b0" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index cebd863d..4789cade 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,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 = "2f6a1056f10dbe634c58725ad2893c6cee58bf1c" +SRCREV = "9401306e2db3a1756aab958d0939d12c8d5f46e0" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index e71d2828..1b0e51e7 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 = "755c5a753d77f4c8f53788c870240e60673417a0" +SRCREV = "cb8388ac1de37ff31786cd1bd4723938b76d0f0a" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 41c31283..aad757cc 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 = "b1cb2782b369413add8aeb4c4e6c1453bbf5e367" +SRCREV = "ce508999540cb125dad40dd250b17e6ad20d542b" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 4b912be4..1d48f5b0 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 = "64199169df6bd5b1e31d934c0a64c13d57d0f5c4" +SRCREV = "b18c452fdbe09c54caacb4323dea65b3746485e5" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 1dad6ad1..648460db 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 = "6fad8e67d879b1979c48ee615a972571a6426718" +SRCREV = "2f2b747ebc4dd982caede82a0a931ad73e4cd462" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index c167f0a7..e7d8872d 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 = "a4c2e4de3c8c248a340bef815105371f365a456a" +SRCREV = "3a4c634241f7271ddfbb840a42d6bf863b46ccea" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index d2b905b6..e33d17d2 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 = "1f8d498752fed0b2b92d6a619aa11524dd771998" +SRCREV = "cc9250477eaa71a3f3ffd050591d4a9d835288ca" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 88948a56..bbaee2ef 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 = "8cd09ac290c75eeeb91c015e7d7791b15c0cac5e" +SRCREV = "88266670663256f40019e7163092e17401557d5f" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 55f39205..21ca0590 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 = "c7f9640cb883c05e1ba51dac69078782b7eff855" +SRCREV = "2413bc23c5f9995752fdd03d56e480d661fc6fbc" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 58ffbe78..cfcfad8e 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 = "bcdc00bcdc67ee478369c04c994c1f576e51cfab" +SRCREV = "79037e46eeb00e20c5f3bbe7d0de4b702af86884" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index cc3c867a..b468ecb1 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 = "5bcd09ac1b670658c77b7712873c75893e4a41a4" +SRCREV = "fdba7f6e285d35757190d99f9880e3bd0380e254" diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 8de23c76..d15af51e 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -14,8 +14,9 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> --- src/buildtools/configure_host.pro | 14 +++++++------- + src/buildtools/gn.pro | 4 ++-- src/core/config/linux.pri | 2 +- - 2 files changed, 8 insertions(+), 8 deletions(-) + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro index dd0d3e32..6312c867 100644 @@ -56,11 +57,26 @@ index dd0d3e32..6312c867 100644 " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ +diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro +index b6bf9cf..ae419b1 100644 +--- a/src/buildtools/gn.pro ++++ b/src/buildtools/gn.pro +@@ -19,8 +19,8 @@ build_pass|!debug_and_release { + gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) + + gn_gen_args = --no-last-commit-position --out-path $$out_path \ +- --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ +- --ld \"$$which($$QMAKE_LINK)\" ++ --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ ++ --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" + + msvc:!clang_cl: gn_gen_args += --use-lto + diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 9fc8c6e8..f3768585 100644 +index 95b7a4b..db0658e 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri -@@ -113,7 +113,7 @@ contains(QT_ARCH, "mips") { +@@ -116,7 +116,7 @@ contains(QT_ARCH, "mips") { host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch deleted file mode 100644 index 4e901aa9..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b0e6bada9d4da53204dffa7d9343f925c7d5603e Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Wed, 15 Mar 2017 13:53:28 +0200 -Subject: [PATCH] chromium: Force host toolchain configuration - -Force gcc/g++ to be used for parts using host toolchain, since -the option(host_build) does not work in yocto builds. - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - gn/build/gen.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gn/build/gen.py b/gn/build/gen.py -index 87db4c26bcf..34c853b7f4a 100755 ---- a/gn/build/gen.py -+++ b/gn/build/gen.py -@@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): - ld = os.environ.get('LD', 'g++') - ar = os.environ.get('AR', 'ar -X64') - else: -- cc = os.environ.get('CC', 'cc') -- cxx = os.environ.get('CXX', 'c++') -+ cc = os.environ.get('CC_host', 'gcc') -+ cxx = os.environ.get('CXX_host', 'g++') - ld = cxx -- ar = os.environ.get('AR', 'ar') -+ ar = os.environ.get('AR_host', 'ar') - - # QTBUG-64759 - # cflags = os.environ.get('CFLAGS', '').split() diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch deleted file mode 100644 index 8281dd71..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 53b101c4d3d419920d8a9f96d8afe10716c137c5 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 5 Jun 2018 13:58:16 +0000 -Subject: [PATCH] chromium: Fix build with gcc8 - ---- - chromium/mojo/public/c/system/buffer.h | 2 +- - chromium/mojo/public/c/system/data_pipe.h | 2 +- - chromium/mojo/public/c/system/message_pipe.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h -index 2cc54270ad1..917415f8db4 100644 ---- a/chromium/mojo/public/c/system/buffer.h -+++ b/chromium/mojo/public/c/system/buffer.h -@@ -30,7 +30,7 @@ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions { - // See |MojoCreateSharedBufferFlags|. - MojoCreateSharedBufferFlags flags; - }; --MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); -+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); - MOJO_STATIC_ASSERT(sizeof(MojoCreateSharedBufferOptions) == 8, - "MojoCreateSharedBufferOptions has wrong size"); - -diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h -index 3702cdb6249..a86c8e8b321 100644 ---- a/chromium/mojo/public/c/system/data_pipe.h -+++ b/chromium/mojo/public/c/system/data_pipe.h -@@ -40,7 +40,7 @@ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions { - // system-dependent capacity of at least one element in size. - uint32_t capacity_num_bytes; - }; --MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); -+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); - MOJO_STATIC_ASSERT(sizeof(MojoCreateDataPipeOptions) == 16, - "MojoCreateDataPipeOptions has wrong size"); - -diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h -index 9f222f9aa81..4878774707a 100644 ---- a/chromium/mojo/public/c/system/message_pipe.h -+++ b/chromium/mojo/public/c/system/message_pipe.h -@@ -35,7 +35,7 @@ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions { - // See |MojoCreateMessagePipeFlags|. - MojoCreateMessagePipeFlags flags; - }; --MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); -+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); - MOJO_STATIC_ASSERT(sizeof(MojoCreateMessagePipeOptions) == 8, - "MojoCreateMessagePipeOptions has wrong size"); - diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch index 3305c6b4..7823482b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch @@ -6,15 +6,15 @@ Subject: [PATCH] chromium: fix build with clang Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - chromium/build/config/compiler/BUILD.gn | 27 ++----------------------- + chromium/build/config/compiler/BUILD.gn | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn index d223a4f6fd4..1c42c49ea4a 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -544,13 +544,6 @@ config("compiler") { - ] +@@ -561,13 +561,6 @@ config("compiler") { + } } - # Tells the compiler not to use absolute paths when passing the default @@ -27,7 +27,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 # C11/C++11 compiler flags setup. # --------------------------- if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { -@@ -748,8 +741,6 @@ config("compiler_cpu_abi") { +@@ -799,8 +792,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { @@ -36,7 +36,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } if (!is_nacl) { cflags += [ -@@ -762,8 +753,6 @@ config("compiler_cpu_abi") { +@@ -813,8 +804,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { @@ -45,7 +45,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -772,9 +761,6 @@ config("compiler_cpu_abi") { +@@ -823,9 +812,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -55,7 +55,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } } else { cflags += [ "-EL" ] -@@ -853,10 +839,7 @@ config("compiler_cpu_abi") { +@@ -904,10 +890,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -67,7 +67,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 cflags += [ "-EB" ] ldflags += [ "-EB" ] } -@@ -902,9 +885,6 @@ config("compiler_cpu_abi") { +@@ -954,9 +937,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -77,7 +77,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } } else { cflags += [ -@@ -961,10 +941,7 @@ config("compiler_cpu_abi") { +@@ -1013,10 +993,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips64") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch deleted file mode 100644 index 5988ec7f..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4e99677795977faccd1f28ac8fb8b3cfd72c4dcd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 2 Feb 2019 22:09:20 -0800 -Subject: [PATCH] chromium: Check for __ARM_FP & 2 before using __fp16 - -The __fp16 type denotes half-precision (16-bit) floating-point. -The recommended way to test for this hardware support is to test bit 1 in __ARM_FP -and -If 16-bit floating-point is available, one of __ARM_FP16_FORMAT_IEEE and -__ARM_FP16_FORMAT_ALTERNATIVE will be defined to indicate the format in use - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -index 33d9e7aa39f..aaefa5371ae 100644 ---- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -@@ -679,7 +679,7 @@ SI F from_half(U16 h) { - } - - SI U16 to_half(F f) { --#if defined(__ARM_FP16_FORMAT_IEEE) -+#if defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) && (__ARM_FP & 2) - __fp16 fp16 = __fp16(f); - U16 u16; - memcpy(&u16, &fp16, sizeof(U16)); diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch index 377795f8..9a080207 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -18,12 +18,12 @@ diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUIL index 05907b481ac..dbc4be143cd 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn -@@ -70,8 +70,11 @@ config("zlib_arm_crc32_config") { - # - ChromeOS has wrapper scripts that are borking the compiler flags. +@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { + # implement the CRC32* instructions. These are optional in ARMv8.0." # - Fuchsia just added a syscall for feature detection. # TODO(cavalcantii): crbug.com/810125. + defines = [] - if (!is_ios && !is_chromeos && !is_fuchsia) { + if (is_clang && (!is_ios && !is_fuchsia)) { - defines = [ "CRC32_ARMV8_CRC32" ] + if (current_cpu == "arm64") { + defines += [ "CRC32_ARMV8_CRC32" ] diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 84fcfbfb..a281cba2 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -132,7 +132,7 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "69-based" +QT_MODULE_BRANCH_CHROMIUM = "73-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12 # 5.12.meta-qt5.4 @@ -148,12 +148,9 @@ SRC_URI_append_libc-musl = "\ # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/69-based # 69-based.meta-qt5.4 SRC_URI += " \ - file://chromium/0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ - file://chromium/0003-chromium-Fix-build-with-gcc8.patch;patchdir=src/3rdparty \ file://chromium/0004-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ file://chromium/0019-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ - file://chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch;patchdir=src/3rdparty \ file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ " @@ -175,8 +172,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "c7b8d6d87809253241913c595902a11ea506b2b7" -SRCREV_chromium = "4c7ecce30045daf172dceaeeb86351f60cc91990" +SRCREV_qtwebengine = "5d4bac57a0191287a2fc345f6b398fb1f5d08517" +SRCREV_chromium = "8a28c0bb19fc8627812cb7c3154408b71ff2bf5e" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 01538d0d..b5760229 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 = "9007ba49d14ef56e56a2114685ddd5b23e25f5c8" +SRCREV = "15637e6d824bca5d149147207a98cbc016fbbef6" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 59f5cd85..11144537 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 = "0f1373617f2d1c562fd448fee207f7d99a0191bc" +SRCREV = "b7d892b97697f90b3669dab56358a48fb3542f68" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 60733298..dc2a3e4b 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 = "3ae7d8eac3a46b5a70d71c556703ce2f21c169dc" +SRCREV = "3265fa961a27894faa5b3413fb39c8682266a72f" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index aca99236..31c5b671 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 = "b5c05ebc46fde8e98e388cd5bf86795b040da505" +SRCREV = "7e86e23ee87f2450b3f7103632c3ad2ab082e5eb" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 103648eb..73631fcd 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 = "f969bdea083012282806ae83a38ace53ef1ba600" +SRCREV = "29891df4ce099542635e33891945ba19f3e9572c" BBCLASSEXTEND =+ "native nativesdk" |