mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-04 05:04:36 +02:00
qt5: upgrade to 5.11.3
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
committed by
Martin Jansa
parent
9fc65c05f3
commit
0cdf727668
@@ -195,4 +195,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 = "49efea26a5fae8c2275999c36c7c8d24cf4125de"
|
||||
SRCREV = "08de243eaa007597c2bfbc97d3d14e2f821ac4be"
|
||||
|
||||
@@ -36,6 +36,6 @@ do_configure_prepend() {
|
||||
${S}/src/quick3d/imports/input/importsinput.pro
|
||||
}
|
||||
|
||||
SRCREV = "03253babc2077795eca2decfd8b9d6310f49ce93"
|
||||
SRCREV = "cd3e621ccf56bb8262f9c8cd967e05bf41934060"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PV = "5.11.2+git${SRCPV}"
|
||||
PV = "5.11.3+git${SRCPV}"
|
||||
|
||||
@@ -139,4 +139,4 @@ do_install() {
|
||||
echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
|
||||
}
|
||||
|
||||
SRCREV = "49efea26a5fae8c2275999c36c7c8d24cf4125de"
|
||||
SRCREV = "08de243eaa007597c2bfbc97d3d14e2f821ac4be"
|
||||
|
||||
@@ -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?= <schnitzeltony@gmail.com>
|
||||
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 <schnitzeltony@gmail.com>
|
||||
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)
|
||||
|
||||
@@ -110,7 +110,7 @@ PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0"
|
||||
# fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype
|
||||
# works only together with fontconfig
|
||||
PACKAGECONFIG[freetype] = "-system-freetype,-qt-freetype,freetype"
|
||||
PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-no-harfbuzz,harfbuzz"
|
||||
PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-qt-harfbuzz,harfbuzz"
|
||||
PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg"
|
||||
PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng"
|
||||
PACKAGECONFIG[gif] = "-gif,-no-gif"
|
||||
@@ -259,4 +259,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
|
||||
|
||||
RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
|
||||
|
||||
SRCREV = "49efea26a5fae8c2275999c36c7c8d24cf4125de"
|
||||
SRCREV = "08de243eaa007597c2bfbc97d3d14e2f821ac4be"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS = "qtdeclarative"
|
||||
|
||||
SRCREV = "96a47ce9de9e61ca92561160bc6d586c156094d2"
|
||||
SRCREV = "8726c86872134cf4b4396fa5e7ca8eba4ef37ed4"
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia"
|
||||
|
||||
SRCREV = "28f8372233b5a4bbc740959d4a7d0d4823727798"
|
||||
SRCREV = "444aeb81f2555a37d94862ceaaa8295c5c7ddddd"
|
||||
|
||||
# The same issue as in qtbase:
|
||||
# http://errors.yoctoproject.org/Errors/Details/152641/
|
||||
|
||||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "5f30c77484a9af223d32067f579d440010520eb2"
|
||||
SRCREV = "d1cf8dad0e6d8d08b5c6f2f08d85a0e75b0bcf8a"
|
||||
|
||||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
|
||||
|
||||
SRCREV = "f305948c23f631ddce3e49c4bd90149997c0903c"
|
||||
SRCREV = "a04bbfd93159963aa505f96425e85a2a83b0b10a"
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 260e165993fe15a1668cfd36caee18a95b2d2f59 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
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 <simon.hausmann@qt.io>
|
||||
---
|
||||
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 = \
|
||||
@@ -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)}"
|
||||
@@ -33,6 +35,6 @@ do_install_append_class-nativesdk() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "c2494382432d66cc08c14877378354f1b6cd6bfd"
|
||||
SRCREV = "e3c0bb7811407bad1f65ea55639a4b1d1d39be15"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "e3b436f6718e666f4c5baa3b768993382809e1ed"
|
||||
SRCREV = "4005b78c2bde8fd9cf1cbe3155cbe6c33f576111"
|
||||
|
||||
@@ -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 = "965da52a583a27fc41a489a4141f78c3acb0d143"
|
||||
SRCREV = "d560b79d050659715159d5f04b2e96fd38d0230c"
|
||||
|
||||
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "855106d17258638cf50099b47d2db801c747ebb6"
|
||||
SRCREV = "335dc6af7d24c1731cbd7e03a21e66c70d81760d"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "b415d1fc2231261a641ada2ffe8332a259ad6b88"
|
||||
SRCREV = "dea2cde014f2a74390a444d9d59e6deb2801c40b"
|
||||
|
||||
@@ -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 = "67a93bb3684b5146505cf570da6c714d0bfe4b1d"
|
||||
SRCREV_qtlocation = "ffac0dc5a60c93663f6a4ea5483422c58cdb52b6"
|
||||
SRCREV_qtlocation-mapboxgl = "b59b0450c60b3df9e0852f62f6c8a6024889cd9e"
|
||||
|
||||
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "d733d6f950bc05ab195e9936bc69236eecfb6382"
|
||||
SRCREV = "7e0587f9b4906976ec0397768b0378573fbf2fff"
|
||||
|
||||
@@ -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 = "2c5efb49495e31afa399a1c1ea003a9b630ba113"
|
||||
SRCREV = "6966a09c9a6a2c134a739446cc582e47d0c6ed6d"
|
||||
|
||||
@@ -9,4 +9,4 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "f76f07ee7328b8d402bf0b12aa99023b8955d4ed"
|
||||
SRCREV = "90ae677b45570e45adc9d03ba9967065fdfa0432"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "13925e560cfcf80dd6c10c8936af8bcc67cf97e3"
|
||||
SRCREV = "326bf6a1058d878b7891ee6d7078ed381c462df1"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "e5ae8515422fd0cc7cf9aa91c8b0c38fa53fd9a9"
|
||||
SRCREV = "d11d7ff9eff2a68441ff6264b04f37bd862bdd64"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtdeclarative-native"
|
||||
|
||||
SRCREV = "e7213c0460788f49ec6c2204bfd5c0517699aa51"
|
||||
SRCREV = "431d605edb48321c71935fbd2bb82d33e231ea55"
|
||||
|
||||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
|
||||
"
|
||||
|
||||
SRCREV = "e02910386a4c0c3fd4f813a58b211d21622f750f"
|
||||
SRCREV = "6b7f91c097f7e47cf2683d08b5838fd061a872bd"
|
||||
|
||||
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "d292f1d93ffef611a0a6e9f393251785e1e9b779"
|
||||
SRCREV = "92ae729691f6db9fb06b0475509dc1141ac3d93c"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -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 = "eb28710655e4cf1059ec450527061d777fcb867e"
|
||||
SRCREV = "cf09bc7285793d81a9755bf7e807c9d51d47d980"
|
||||
|
||||
@@ -10,7 +10,7 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
|
||||
|
||||
SRCREV = "4f6797ac018f931f3655a53ca5d4ca0114f321e0"
|
||||
SRCREV = "b99d699a8e1fe1a2968edafa6f0154a2581c2143"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11
|
||||
# 5.11.meta-qt5.5
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "58854bdb19cfff1c66788a3035f2aa12b34cce00"
|
||||
SRCREV = "0dab0ff3d33292bc1647ebb68dbeb8556707b5ad"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtserialport"
|
||||
|
||||
SRCREV = "71966594c3ed75f5a863fc99956aca90d3b08655"
|
||||
SRCREV = "857ed94b55b59859f41c55076c51e92f163cb9f7"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "3f0285847230151026890e668b2ff13944b902ee"
|
||||
SRCREV = "5e3f1365813079f1a9a9af284b6a40bd9df8e1c0"
|
||||
|
||||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "32c93cbca8b2f337e0801537d52e416289b3f464"
|
||||
SRCREV = "ab492718dec3b54fce736b642dc6975d9b0046af"
|
||||
|
||||
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
|
||||
"
|
||||
|
||||
SRCREV = "ff440191de244307c968b251faee4122267d3094"
|
||||
SRCREV = "ddc4fba789c21bd0ebca180fa9d7cde399a49e37"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
|
||||
@@ -103,4 +103,4 @@ FILES_${PN}-qthelp = " \
|
||||
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
|
||||
"
|
||||
|
||||
SRCREV = "60de15a0e0121096239cf6031250d2862e77971d"
|
||||
SRCREV = "ed5110171ca294207f341f46610c716170c06282"
|
||||
|
||||
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
|
||||
|
||||
SRCREV = "631b2089bc1cc73aa78a4ede1a731c8bdfbe8503"
|
||||
SRCREV = "a8cab520dc7bedff73ec60a5a189b21cdf01f083"
|
||||
|
||||
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "297bcd005c4205f69e1bf9e9dc565ab757cf0bac"
|
||||
SRCREV = "9ce3088d226fddc18bcac170fa5cc5be3c29e371"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtwebsockets"
|
||||
|
||||
SRCREV = "daecad4cc7552cff68aa6c87cd78cb3b7a0d73f6"
|
||||
SRCREV = "94fee0eaa3a5ce98bae8e5d68c91c0366fa94cdc"
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
From 50a92a60b04d0e6253a903a53f5b01da2d00072d Mon Sep 17 00:00:00 2001
|
||||
From: Cleiton Bueno <cleitonrbueno@gmail.com>
|
||||
Date: Fri, 25 Dec 2015 18:16:05 -0200
|
||||
Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
|
||||
|
||||
Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
|
||||
---
|
||||
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 <QString>
|
||||
#include <QtCore/qcompilerdetection.h>
|
||||
#include <QtGui/qaccessibleobject.h>
|
||||
+#include <QColor>
|
||||
+
|
||||
|
||||
namespace QtWebEngineCore {
|
||||
class WebContentsAdapter;
|
||||
@@ -1,23 +0,0 @@
|
||||
From d61b28affb7d895e12dfa0e0390c488ec3b2a1f8 Mon Sep 17 00:00:00 2001
|
||||
From: Cleiton Bueno <cleitonrbueno@gmail.com>
|
||||
Date: Thu, 24 Dec 2015 15:59:51 -0200
|
||||
Subject: [PATCH] Include dependency to QCoreApplication::translate()
|
||||
|
||||
Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
|
||||
---
|
||||
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 <list>
|
||||
#include <map>
|
||||
|
||||
+#include <QCoreApplication>
|
||||
+
|
||||
#include "web_contents_adapter_client.h"
|
||||
|
||||
#include "base/callback.h"
|
||||
@@ -140,8 +140,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 \
|
||||
"
|
||||
@@ -175,8 +173,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 = "89afebb830f616a6e8c43dd37bf34551f243b264"
|
||||
SRCREV_chromium = "7085115f51ce9d02cfff216a3f74b1fb6715f38d"
|
||||
SRCREV_qtwebengine = "18412af977d658f243eb5b25b62284924cfa362f"
|
||||
SRCREV_chromium = "2095a35f300bcbe82e968e9a547dff7c79be29d8"
|
||||
SRCREV = "${SRCREV_qtwebengine}"
|
||||
|
||||
SRCREV_FORMAT = "qtwebengine_chromium"
|
||||
|
||||
@@ -18,4 +18,4 @@ do_configure_prepend() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "9a19f14013519f3c00a53b4204c7a7d1b2d0acc5"
|
||||
SRCREV = "b57a3ce9d95f36ca0f1b1d1e9cf1e20030e882d8"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "e71467cb569c8d1453e023701b17c9ce9e3fdb86"
|
||||
SRCREV = "395c1f1aed90f740f079d8f980c93f459b44733a"
|
||||
|
||||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
|
||||
COMPATIBLE_MACHINE_armv7ve = "(.*)"
|
||||
COMPATIBLE_MACHINE_aarch64 = "(.*)"
|
||||
|
||||
SRCREV = "b9fef247821416de6532a5ed375a01039c6336dd"
|
||||
SRCREV = "779bf9c3f24365df3f681a029cafd78c7991e929"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "295c13f5779795c5ec49c7a1ada70287707a8fd6"
|
||||
SRCREV = "877c585bc474934e3bb1044293a62c72cb01b9cf"
|
||||
|
||||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "15e22118d01ae39722d1836715fe9cf8b6d3ee88"
|
||||
SRCREV = "657995db766faa48084024e780c4cd02fa05c527"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user