summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/recipetool/create_qt5.py1
-rw-r--r--recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch62
-rw-r--r--recipes-qt/maliit/maliit-framework-qt5_git.bb1
-rwxr-xr-xrecipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb3
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch75
-rw-r--r--recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch26
-rw-r--r--recipes-qt/qt5/ogl-runtime_git.bb8
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb4
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch12
-rw-r--r--recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch12
-rw-r--r--recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch13
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtcoap_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb8
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb16
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtknx_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb7
-rw-r--r--recipes-qt/qt5/qtlottie_git.bb2
-rw-r--r--recipes-qt/qt5/qtmqtt_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtopcua_git.bb2
-rw-r--r--recipes-qt/qt5/qtpurchasing_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick3d_git.bb27
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb6
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb4
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch34
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch28
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch91
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch14
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch12
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch12
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb7
-rw-r--r--recipes-qt/qt5/qtwebglplugin_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
60 files changed, 219 insertions, 342 deletions
diff --git a/lib/recipetool/create_qt5.py b/lib/recipetool/create_qt5.py
index 3ac991fb..dab67b4a 100644
--- a/lib/recipetool/create_qt5.py
+++ b/lib/recipetool/create_qt5.py
@@ -47,7 +47,6 @@ class Qt5CmakeHandler(CmakeExtensionHandler):
47 'qtsystems': 'Qt5PublishSubscribe Qt5ServiceFramework Qt5SystemInfo', 47 'qtsystems': 'Qt5PublishSubscribe Qt5ServiceFramework Qt5SystemInfo',
48 'qtscript': 'Qt5Script Qt5ScriptTools', 48 'qtscript': 'Qt5Script Qt5ScriptTools',
49 'qttools': 'Qt5Designer Qt5Help Qt5LinguistTools Qt5UiPlugin Qt5UiTools', 49 'qttools': 'Qt5Designer Qt5Help Qt5LinguistTools Qt5UiPlugin Qt5UiTools',
50 'qtenginio': 'Qt5Enginio',
51 'qtsensors': 'Qt5Sensors', 50 'qtsensors': 'Qt5Sensors',
52 'qtmultimedia': 'Qt5Multimedia Qt5MultimediaWidgets', 51 'qtmultimedia': 'Qt5Multimedia Qt5MultimediaWidgets',
53 'qtwebchannel': 'Qt5WebChannel', 52 'qtwebchannel': 'Qt5WebChannel',
diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch
new file mode 100644
index 00000000..d86be1e1
--- /dev/null
+++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch
@@ -0,0 +1,62 @@
1From 78a4b12b64c26f29e64fe56801e92d1e76f362b0 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 16 Aug 2019 15:08:41 +0300
4Subject: [PATCH] Fix test installations
5
6Qmake won't ignore install errors anymore.
7
8Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
9---
10 .../ut_mattributeextensionmanager.pro | 7 ++++---
11 tests/ut_mimpluginmanager/ut_mimpluginmanager.pro | 7 ++++---
12 .../ut_mimpluginmanagerconfig.pro | 3 ---
13 3 files changed, 8 insertions(+), 9 deletions(-)
14
15diff --git a/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro b/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro
16index 22280882..d0c390ef 100644
17--- a/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro
18+++ b/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro
19@@ -13,9 +13,10 @@ CONFIG += plugin
20 include($$TOP_DIR/src/libmaliit-plugins.pri)
21 include($$TOP_DIR/connection/libmaliit-connection.pri)
22
23-target.files += \
24- $$TARGET \
25+extra.files += \
26 toolbar1.xml \
27- toolbar2.xml \
28+ toolbar2.xml
29+extra.path = $$target.path
30+INSTALLS += extra
31
32 include(../common_check.pri)
33diff --git a/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro b/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro
34index 19e68e6a..44e0fa0f 100644
35--- a/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro
36+++ b/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro
37@@ -17,9 +17,10 @@ include($$TOP_DIR/src/libmaliit-plugins.pri)
38 # For MImInputContextConnection pulled in by TestInputMethodHost
39 include($$TOP_DIR/connection/libmaliit-connection.pri)
40
41-target.files += \
42- $$TARGET \
43+extra.files += \
44 toolbar1.xml \
45- toolbar2.xml \
46+ toolbar2.xml
47+extra.path = $$target.path
48+INSTALLS += extra
49
50 include(../common_check.pri)
51diff --git a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro
52index 739ceef6..e0b363c8 100644
53--- a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro
54+++ b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro
55@@ -17,7 +17,4 @@ include($$TOP_DIR/src/libmaliit-plugins.pri)
56 # For MImInputContextConnection pulled in by TestInputMethodHost
57 include($$TOP_DIR/connection/libmaliit-connection.pri)
58
59-target.files += \
60- $$TARGET \
61-
62 include(../common_check.pri)
diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb
index c767d2a1..1f0dc8d6 100644
--- a/recipes-qt/maliit/maliit-framework-qt5_git.bb
+++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb
@@ -12,6 +12,7 @@ SRC_URI = "git://github.com/maliit/framework.git;branch=master \
12 file://0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch \ 12 file://0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch \
13 file://0001-Drop-tr1-namespace-its-not-there-in-c-11-and-newer.patch \ 13 file://0001-Drop-tr1-namespace-its-not-there-in-c-11-and-newer.patch \
14 file://0001-examples-plugins-Replace-obsolete-screenGeometry.patch \ 14 file://0001-examples-plugins-Replace-obsolete-screenGeometry.patch \
15 file://0001-Fix-test-installations.patch \
15 " 16 "
16 17
17SRCREV = "60b1b10de14f932420313c547ab801daf522d539" 18SRCREV = "60b1b10de14f932420313c547ab801daf522d539"
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index b912d891..6e8b2d4f 100755
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -52,9 +52,6 @@ RDEPENDS_${PN} += " \
52 qtdeclarative-tools \ 52 qtdeclarative-tools \
53 qtdeclarative-staticdev \ 53 qtdeclarative-staticdev \
54 qttranslations-qtdeclarative \ 54 qttranslations-qtdeclarative \
55 qtenginio-dev \
56 qtenginio-mkspecs \
57 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtenginio-qmlplugins', '', d)} \
58 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects-qmlplugins', '', d)} \ 55 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects-qmlplugins', '', d)} \
59 qtimageformats-dev \ 56 qtimageformats-dev \
60 qtimageformats-plugins \ 57 qtimageformats-plugins \
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index e0ee03e7..d186bd17 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() {
193do_generate_qt_environment_file[umask] = "022" 193do_generate_qt_environment_file[umask] = "022"
194addtask generate_qt_environment_file after do_install before do_package 194addtask generate_qt_environment_file after do_install before do_package
195 195
196SRCREV = "5aa13ea144cff4dbadf12c08b7aa49646347e186" 196SRCREV = "72d62144ab2bf67266aa0474515b54999b459d32"
diff --git a/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch
deleted file mode 100644
index fcf6915d..00000000
--- a/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From c80b588cc3e11a80ffedd778fab3f19c686552f7 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 5 Aug 2019 14:24:44 +0300
4Subject: [PATCH] Fix format-security issues
5
6format not a string literal and no format arguments [-Wformat-security]
7
8Change-Id: I04c1d1598948b664b9d85036030c6f89fcf3c8b7
9---
10 src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | 4 ++--
11 src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | 8 ++++----
12 2 files changed, 6 insertions(+), 6 deletions(-)
13
14diff --git a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
15index ac5b992..02046ac 100644
16--- a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
17+++ b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
18@@ -663,7 +663,7 @@ NVRenderBackendGLES2Impl::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum s
19 // check for error
20 GLenum error = m_glFunctions->glGetError();
21 if (error != GL_NO_ERROR) {
22- qCCritical(GL_ERROR, GLConversion::processGLError(error));
23+ qCCritical(GL_ERROR) << GLConversion::processGLError(error);
24 QT3DS_ASSERT(false);
25 GL_CALL_EXTRA_FUNCTION(glDeleteRenderbuffers(1, &bufID));
26 bufID = 0;
27@@ -699,7 +699,7 @@ bool NVRenderBackendGLES2Impl::ResizeRenderbuffer(NVRenderBackendRenderbufferObj
28 // check for error
29 GLenum error = m_glFunctions->glGetError();
30 if (error != GL_NO_ERROR) {
31- qCCritical(GL_ERROR, GLConversion::processGLError(error));
32+ qCCritical(GL_ERROR) << GLConversion::processGLError(error);
33 QT3DS_ASSERT(false);
34 success = false;
35 }
36diff --git a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
37index 0fe6e0f..5dfe9d1 100644
38--- a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
39+++ b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
40@@ -604,7 +604,7 @@ NVRenderBackendGLBase::CreateBuffer(size_t size, NVRenderBufferBindFlags bindFla
41 } else {
42 GL_CALL_FUNCTION(glDeleteBuffers(1, &bufID));
43 bufID = 0;
44- qCCritical(GL_ERROR, GLConversion::processGLError(target));
45+ qCCritical(GL_ERROR) << GLConversion::processGLError(target);
46 }
47 }
48
49@@ -832,7 +832,7 @@ NVRenderBackendGLBase::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum stor
50 // check for error
51 GLenum error = m_glFunctions->glGetError();
52 if (error != GL_NO_ERROR) {
53- qCCritical(GL_ERROR, GLConversion::processGLError(error));
54+ qCCritical(GL_ERROR) << GLConversion::processGLError(error);
55 QT3DS_ASSERT(false);
56 GL_CALL_FUNCTION(glDeleteRenderbuffers(1, &bufID));
57 bufID = 0;
58@@ -869,7 +869,7 @@ bool NVRenderBackendGLBase::ResizeRenderbuffer(NVRenderBackendRenderbufferObject
59 // check for error
60 GLenum error = m_glFunctions->glGetError();
61 if (error != GL_NO_ERROR) {
62- qCCritical(GL_ERROR, GLConversion::processGLError(error));
63+ qCCritical(GL_ERROR) << GLConversion::processGLError(error);
64 QT3DS_ASSERT(false);
65 success = false;
66 }
67@@ -1306,7 +1306,7 @@ bool NVRenderBackendGLBase::compileSource(GLuint shaderID, NVConstDataRef<QT3DSI
68 GLenum binaryError = m_glFunctions->glGetError();
69 if (binaryError != GL_NO_ERROR) {
70 shaderStatus = GL_FALSE;
71- qCCritical(GL_ERROR, GLConversion::processGLError(binaryError));
72+ qCCritical(GL_ERROR) << GLConversion::processGLError(binaryError);
73 }
74 }
75
diff --git a/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch b/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch
deleted file mode 100644
index 5fe840a0..00000000
--- a/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From f654a25f9df6583532798f30181d149d51b23808 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 8 Aug 2019 08:34:47 +0300
4Subject: [PATCH] Fix build on musl libc
5
6Use bits/local_lim.h only with glibc as it's not available
7on musl libc.
8
9Change-Id: Ibffa4ab5649b544664f99b16e94d6865148eeeb5
10---
11 src/foundation/linux/Qt3DSLinuxThread.cpp | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/foundation/linux/Qt3DSLinuxThread.cpp b/src/foundation/linux/Qt3DSLinuxThread.cpp
15index fa6e069..99c4c3a 100644
16--- a/src/foundation/linux/Qt3DSLinuxThread.cpp
17+++ b/src/foundation/linux/Qt3DSLinuxThread.cpp
18@@ -35,7 +35,7 @@
19 #include "foundation/Qt3DSAssert.h"
20 #include "foundation/Qt3DSIntrinsics.h"
21 #include "foundation/Qt3DSBroadcastingAllocator.h"
22-#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY)
23+#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) && defined(__GLIBC__)
24 #include <bits/local_lim.h> // PTHREAD_STACK_MIN
25 #endif
26 #include <stdio.h>
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
index 049f885a..621d0e24 100644
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -9,19 +9,17 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase qtdeclarative qtquickcontrols2" 10DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
11 11
12QT_MODULE_BRANCH = "2.4" 12QT_MODULE_BRANCH = "master"
13QT_MODULE_BRANCH_EASTL = "master" 13QT_MODULE_BRANCH_EASTL = "master"
14QT_GIT_PROJECT = "qt3dstudio" 14QT_GIT_PROJECT = "qt3dstudio"
15PV = "2.4+git${SRCPV}" 15PV = "2.5+git${SRCPV}"
16 16
17SRC_URI += " \ 17SRC_URI += " \
18 ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ 18 ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \
19 file://0001-Fix-examples-build-error.patch \ 19 file://0001-Fix-examples-build-error.patch \
20 file://0002-Fix-format-security-issues.patch \
21 file://0003-Fix-build-on-musl-libc.patch \
22" 20"
23 21
24SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" 22SRCREV_ogl-runtime = "0ab6e1fb491cbc9aa821e11a1ee78915f61ee499"
25SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5" 23SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5"
26SRCREV = "${SRCREV_ogl-runtime}" 24SRCREV = "${SRCREV_ogl-runtime}"
27 25
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 872751f4..5c70693b 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
36 ${S}/src/quick3d/imports/input/importsinput.pro 36 ${S}/src/quick3d/imports/input/importsinput.pro
37} 37}
38 38
39SRCREV = "851b2189a8d31b9306f696c38988bbc554fa9e0c" 39SRCREV = "6c105dc43722cc199924f78cf044dab7a9251f20"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index a9152255..56bbeb66 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.13" 5QT_MODULE_BRANCH ?= "5.14"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.13.2+git${SRCPV}" 17PV = "5.14.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index d89620b0..8828fd3c 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -136,11 +136,9 @@ do_install() {
136 done 136 done
137 fi 137 fi
138 138
139 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
140
141 # since 5.9.2 something sets a very strange path to mkspec ("${_qt5Core_install_prefix}/../../../../../../../../../../usr/lib/qt5//mkspecs/linux-oe-g++") 139 # since 5.9.2 something sets a very strange path to mkspec ("${_qt5Core_install_prefix}/../../../../../../../../../../usr/lib/qt5//mkspecs/linux-oe-g++")
142 # override this until somebody finds a better way 140 # override this until somebody finds a better way
143 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 141 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
144} 142}
145 143
146SRCREV = "5aa13ea144cff4dbadf12c08b7aa49646347e186" 144SRCREV = "72d62144ab2bf67266aa0474515b54999b459d32"
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
index ad6904a4..02796515 100644
--- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
1From 6a6b99564640f71c676ee2301eb4a9f3b979d330 Mon Sep 17 00:00:00 2001 1From 51353f7fa6a7c1480e52e7f630d7bf1f129fbd9e Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400 3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH] configure: bump path length from 256 to 512 characters 4Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
15 1 file changed, 3 insertions(+), 3 deletions(-) 15 1 file changed, 3 insertions(+), 3 deletions(-)
16 16
17diff --git a/configure.pri b/configure.pri 17diff --git a/configure.pri b/configure.pri
18index 3778ece..94bdfd2 100644 18index e26b557..1b470a8 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -851,10 +851,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -844,10 +844,10 @@ defineTest(qtConfOutput_preparePaths) {
22 22
23 $${currentConfig}.output.qconfigSource = \ 23 $${currentConfig}.output.qconfigSource = \
24 "/* Installation Info */" \ 24 "/* Installation Info */" \
diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
index b9cc9d44..c5815c0f 100644
--- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
+++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
@@ -1,4 +1,4 @@
1From d8eb5531c444bcae2c2067a7f67e5229acc75fac Mon Sep 17 00:00:00 2001 1From 723d7ab6150f7ef7b33892b54ddc0931a5e71341 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Sep 2017 10:11:50 -0700 3Date: Sun, 3 Sep 2017 10:11:50 -0700
4Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc 4Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc
@@ -7,13 +7,13 @@ musl does not have feenableexcept function
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9--- 9---
10 tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 2 +- 10 tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 13diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
14index 5d344834e6..1afc70d255 100644 14index 676c66d..ba05aad 100644
15--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 15--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
16+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 16+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
17@@ -46,7 +46,7 @@ 17@@ -46,7 +46,7 @@
18 #include <private/qlocale_tools_p.h> 18 #include <private/qlocale_tools_p.h>
19 #include <qnumeric.h> 19 #include <qnumeric.h>
diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
index 61a5b80f..192385a5 100644
--- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
+++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
@@ -22,20 +22,20 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
22 2 files changed, 2 insertions(+), 2 deletions(-) 22 2 files changed, 2 insertions(+), 2 deletions(-)
23 23
24diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf 24diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
25index 5800aaa5b4..7b4901ce46 100644 25index aead581478..8e06a069b4 100644
26--- a/mkspecs/common/clang.conf 26--- a/mkspecs/common/clang.conf
27+++ b/mkspecs/common/clang.conf 27+++ b/mkspecs/common/clang.conf
28@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX 28@@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch
29 CONFIG += clang_pch_style 29
30 QMAKE_PCH_OUTPUT_EXT = .pch 30 QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
31 31
32-QMAKE_CFLAGS_ISYSTEM = -isystem 32-QMAKE_CFLAGS_ISYSTEM = -isystem
33+QMAKE_CFLAGS_ISYSTEM = 33+QMAKE_CFLAGS_ISYSTEM =
34 QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} 34 QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
35 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} 35 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
36 QMAKE_CFLAGS_LTCG = -flto 36 QMAKE_CFLAGS_LTCG = -flto=thin
37diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf 37diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
38index c2669e4833..3fde8dc85f 100644 38index 44b4267207..9756a02014 100644
39--- a/mkspecs/common/gcc-base.conf 39--- a/mkspecs/common/gcc-base.conf
40+++ b/mkspecs/common/gcc-base.conf 40+++ b/mkspecs/common/gcc-base.conf
41@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g 41@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g
diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
index b3c2c767..2d644230 100644
--- a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
+++ b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
@@ -1,4 +1,4 @@
1From 0c79a6761e75441f433fd397bc3b79e78b6c5ef8 Mon Sep 17 00:00:00 2001 1From 33edd09ffb4acaf9b829a31a567508ea251db7ab Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Sun, 14 Apr 2019 13:27:58 +0200 3Date: Sun, 14 Apr 2019 13:27:58 +0200
4Subject: [PATCH] Avoid renameeat2 for native(sdk) builds 4Subject: [PATCH] Avoid renameeat2 for native(sdk) builds
@@ -24,10 +24,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
24 2 files changed, 2 insertions(+), 12 deletions(-) 24 2 files changed, 2 insertions(+), 12 deletions(-)
25 25
26diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h 26diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
27index dfcc3c9c7f..30166fe41c 100644 27index e6ad805..283ce1c 100644
28--- a/src/corelib/global/qconfig-bootstrapped.h 28--- a/src/corelib/global/qconfig-bootstrapped.h
29+++ b/src/corelib/global/qconfig-bootstrapped.h 29+++ b/src/corelib/global/qconfig-bootstrapped.h
30@@ -100,14 +100,14 @@ 30@@ -104,7 +104,7 @@
31 #define QT_FEATURE_process -1 31 #define QT_FEATURE_process -1
32 #define QT_FEATURE_regularexpression -1 32 #define QT_FEATURE_regularexpression -1
33 #ifdef __GLIBC_PREREQ 33 #ifdef __GLIBC_PREREQ
@@ -36,7 +36,8 @@ index dfcc3c9c7f..30166fe41c 100644
36 #else 36 #else
37 # define QT_FEATURE_renameat2 -1 37 # define QT_FEATURE_renameat2 -1
38 #endif 38 #endif
39 #define QT_FEATURE_sharedmemory -1 39@@ -112,7 +112,7 @@
40 #define QT_FEATURE_signaling_nan -1
40 #define QT_FEATURE_slog2 -1 41 #define QT_FEATURE_slog2 -1
41 #ifdef __GLIBC_PREREQ 42 #ifdef __GLIBC_PREREQ
42-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) 43-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
@@ -45,10 +46,10 @@ index dfcc3c9c7f..30166fe41c 100644
45 # define QT_FEATURE_statx -1 46 # define QT_FEATURE_statx -1
46 #endif 47 #endif
47diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp 48diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
48index b2d81066db..d1783ebdf3 100644 49index 74865fe..2b787ee 100644
49--- a/src/corelib/io/qfilesystemengine_unix.cpp 50--- a/src/corelib/io/qfilesystemengine_unix.cpp
50+++ b/src/corelib/io/qfilesystemengine_unix.cpp 51+++ b/src/corelib/io/qfilesystemengine_unix.cpp
51@@ -1248,16 +1248,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy 52@@ -1236,16 +1236,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
52 if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) 53 if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty()))
53 return emptyFileEntryWarning(), false; 54 return emptyFileEntryWarning(), false;
54 55
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index ac4e3e4a..a13897e2 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
275 275
276RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 276RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
277 277
278SRCREV = "5aa13ea144cff4dbadf12c08b7aa49646347e186" 278SRCREV = "72d62144ab2bf67266aa0474515b54999b459d32"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index ce4137af..23bd13c9 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "73efdb1066dcf5b4690de44f712f3de4d5f1fc18" 11SRCREV = "911bc706521021202d4c45a0ed2f7e5edd4e99af"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb
index 2a6fd3e7..7a5eb9dd 100644
--- a/recipes-qt/qt5/qtcoap_git.bb
+++ b/recipes-qt/qt5/qtcoap_git.bb
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
11 11
12DEPENDS += "qtbase" 12DEPENDS += "qtbase"
13 13
14SRCREV = "f3b29d9327aef74bcd5668c4a7377513c9b16b11" 14SRCREV = "b109844c504590a7ba0e793f2e76ed3b6c8a90b4"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 37fd8c52..003ca925 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"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "7390de230e3c86049824bef756e4af623a547d61" 22SRCREV = "db56df7fb05b465bf0e77dd086fc2a7b054ab1d9"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 2d990cd8..66a0f95e 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "1a58c3cffe2190f20aca3d7acbb25a9ff62d6770" 11SRCREV = "49b84db584092f8a1fa9b63c801cf8cdc3bd89ff"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 7ca68c8b..81a26217 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -12,10 +12,12 @@ LIC_FILES_CHKSUM = " \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13" 13"
14 14
15SRC_URI += "file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch"
16
17DEPENDS += "qtbase" 15DEPENDS += "qtbase"
18 16
17SRC_URI += "\
18 file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \
19"
20
19PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" 21PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}"
20PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" 22PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug"
21PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" 23PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network"
@@ -26,6 +28,6 @@ do_install_append_class-nativesdk() {
26 rm -rf ${D}${OE_QMAKE_PATH_QML} 28 rm -rf ${D}${OE_QMAKE_PATH_QML}
27} 29}
28 30
29SRCREV = "d0e88f82e07d7a29572d51cecf950d3844408056" 31SRCREV = "dae5bc672eb177ec858f035e0976e8ad93ca59b3"
30 32
31BBCLASSEXTEND =+ "native nativesdk" 33BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
deleted file mode 100644
index 30d5eeae..00000000
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1require qt5.inc
2require qt5-git.inc
3
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
11"
12
13DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
14
15QT_MODULE_BRANCH = "dev"
16SRCREV = "23603a3b088178d8ec92fddb240e5a5c55d77d5a"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index d7018970..1708b21c 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14 14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "324dd701ec755684a2bc5c7e8b2d5413316f2f53" 17SRCREV = "9a179372c1edff42bd0b4c96ff367e194b916a67"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 61b5f8d9..20b956d0 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "3cac429c9bf0bc43f281aa12cb121bece608cb37" 21SRCREV = "551b1fe346c5704e5ca22d8d4e8b34478f38e2fa"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index bd0a677f..60aa83d5 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "cd646ff7e1990ddcd5438767fa7093131734c171" 28SRCREV = "ac8a82f5ffd08b0b9f8f76be29158ce7e113cb46"
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb
index 83976c98..7cbcf895 100644
--- a/recipes-qt/qt5/qtknx_git.bb
+++ b/recipes-qt/qt5/qtknx_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "8b0120194e5ab01aa8344d781782dd818a262f02" 12SRCREV = "35f6e58cd747a3d19a503c7fa49bb74aeaedd87e"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 078602d4..43244c60 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -14,8 +14,7 @@ LIC_FILES_CHKSUM = " \
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
15 15
16PACKAGECONFIG ??= "" 16PACKAGECONFIG ??= ""
17# older geoclue 0.12.99 is needed 17PACKAGECONFIG[geoclue] = ",,,geoclue"
18PACKAGECONFIG[geoclue] = ",,geoclue"
19PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" 18PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy"
20PACKAGECONFIG[geoservices_here] = "-feature-geoservices_here,-no-feature-geoservices_here" 19PACKAGECONFIG[geoservices_here] = "-feature-geoservices_here,-no-feature-geoservices_here"
21PACKAGECONFIG[geoservices_mapbox] = "-feature-geoservices_mapbox,-no-feature-geoservices_mapbox" 20PACKAGECONFIG[geoservices_mapbox] = "-feature-geoservices_mapbox,-no-feature-geoservices_mapbox"
@@ -36,7 +35,7 @@ SRC_URI += " \
36 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 35 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
37" 36"
38 37
39SRCREV_qtlocation = "118dac89625a8f713bb12e7e9f30bc37b10754b7" 38SRCREV_qtlocation = "51ad54273f1c69f30e4c834f2ecec30a923d3565"
40SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" 39SRCREV_qtlocation-mapboxgl = "5233c75b3f6c73623c5473b2d6573f31f3ddb4b7"
41 40
42SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb
index 80d65d6f..3805c186 100644
--- a/recipes-qt/qt5/qtlottie_git.bb
+++ b/recipes-qt/qt5/qtlottie_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase qtdeclarative" 10DEPENDS += "qtbase qtdeclarative"
11 11
12SRCREV = "b6b7fa3596d1957237d327a37941c6eb3ff8d6b3" 12SRCREV = "665fd2e47bed500ee5395ea5b9a6c57b4940ceed"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index fd6f98ec..e01ea483 100644
--- a/recipes-qt/qt5/qtmqtt_git.bb
+++ b/recipes-qt/qt5/qtmqtt_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "6ad26053ff65dd9bedf3db87dca715ca5387e853" 12SRCREV = "4e4050fdbdeab6e63c0b55947512a92845872930"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 42c34de6..9804e6b2 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -37,4 +37,4 @@ SRC_URI += "\
37# http://errors.yoctoproject.org/Errors/Build/44914/ 37# http://errors.yoctoproject.org/Errors/Build/44914/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "c7bd3131a8854814d59881339ac1d7a4af3c9863" 40SRCREV = "b8382a4ac487c64a70796aa9d9016b5604ca9446"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 4abcc0f2..00f25bac 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "b82a17d8ed996a8f2ff5902fdd229f3b68712c1d" 12SRCREV = "9226e90f4a39cfbaff5db05cb0360681acfa76b9"
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index e060f96f..6d00b0f7 100644
--- a/recipes-qt/qt5/qtopcua_git.bb
+++ b/recipes-qt/qt5/qtopcua_git.bb
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
18 18
19DEPENDS += "qtbase" 19DEPENDS += "qtbase"
20 20
21SRCREV = "2611803da202d9bfade0249ff07bd0d1fd669046" 21SRCREV = "32c6ec66f2c1ace714da703900ae35d59918ebc1"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index 8804b68e..766e822c 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtbase qtdeclarative" 11DEPENDS += "qtbase qtdeclarative"
12 12
13SRCREV = "2fa7323376c99f6ef51fd22a68704e993a7f486f" 13SRCREV = "65fc328d223ae1d8980722ae4a8296ceb75ae91e"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
new file mode 100644
index 00000000..9a6416ca
--- /dev/null
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -0,0 +1,27 @@
1require qt5.inc
2require qt5-git.inc
3
4LICENSE = "(GPL-3.0 & BSD) | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \
6 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
7"
8
9DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
10
11SRC_URI += " \
12 git://github.com/assimp/assimp.git;name=assimp;branch=master;protocol=https;destsuffix=git/src/3rdparty/assimp/src \
13"
14
15PACKAGECONFIG ??= ""
16PACKAGECONFIG[system-assimp] = "-system-assimp,-qt-assimp,assimp"
17
18EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
19
20FILES_${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
22"
23
24SRCREV_qtquick3d = "6d85dc137cbfa338a7cc7570d2be4a2f7f201f1f"
25SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9"
26
27SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index e3325828..d8a37555 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative qtdeclarative-native" 11DEPENDS += "qtdeclarative qtdeclarative-native"
12 12
13SRCREV = "788865b805bc91151ac8fe18bf7b92b1212ee07d" 13SRCREV = "a392194a575653dff3cd21227e6a1a2902b8399f"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 9a58c1be..ccfffb1e 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
18" 18"
19 19
20SRCREV = "da94d6586cbe6b9c12dec8ecc0f842aad807b0d3" 20SRCREV = "6eac099fa98b6dbe5a01ad90e4a1348729b1332b"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 2e069cc6..a8e78958 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "b94871ce10d5d319b7a3293cf939b6a072c3be26" 28SRCREV = "81f93064cb74a6acffc04d218d5d8fe16ce26e25"
29 29
30BBCLASSEXTEND += "native nativesdk" 30BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 96d0a5b8..a342798d 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
36# http://errors.yoctoproject.org/Errors/Build/44915/ 36# http://errors.yoctoproject.org/Errors/Build/44915/
37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
38 38
39SRCREV = "5b75f4edd91a99945f04f34f78875d99e9d919bf" 39SRCREV = "0779791684b3094d329cfe8e0c8550c091be1eed"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 4e60c012..0cd613e7 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,11 +10,13 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "a57befb1da4b7386caf634293ab4563ad90c3107" 13SRCREV = "97cadf64f3dbaf0c7c35242d51dc09c052e5f136"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12
16# 5.12.meta-qt5.2 16# 5.12.meta-qt5.2
17SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" 17SRC_URI += "\
18 file://0001-Use-external-host-bin-path-for-cmake-file.patch \
19"
18 20
19do_install_append_class-nativesdk() { 21do_install_append_class-nativesdk() {
20 # qml files not needed in nativesdk 22 # qml files not needed in nativesdk
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 710fde5e..6206cb23 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "9b4c2e4fcbe8700f0cf95cda887476e9a2d3a545" 15SRCREV = "3be0862945fdd7ce3c1c79342ed1ce567d179cec"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index e6f5b284..c7fe24dd 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "80144b89ca1adede0db9d6e485037f5e431216c3" 14SRCREV = "77ccec69263567b2b41244e483dfb083b883c6d8"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index a411b867..465249ba 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "f6b43c36b3839dae54308a6437bbdd99ae9a44de" 15SRCREV = "aa00e8eb623d5cb4ba32860dd3671a87f3763f89"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index d0f715c4..c91da44e 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "de830ffd455d8a2eb95eba81f86e9a75ed876765" 15SRCREV = "a7cb54082e3fd47758b8f17b0ece15a2f8c38aa5"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index d5e53886..daa9cbc0 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
39 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG-=config_clang', d)} \ 39 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG-=config_clang', d)} \
40" 40"
41 41
42SRCREV = "303d26c6d1c5e87e2e0d1f0032b28a6a50edee03" 42SRCREV = "be238aae25d2a8a9eed9da382f8ba769beb87be5"
43 43
44BBCLASSEXTEND = "native nativesdk" 44BBCLASSEXTEND = "native nativesdk"
45 45
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index cc461c0c..ff8d498f 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -10,7 +10,7 @@ DEPENDS += "qtbase qttools-native"
10 10
11do_install_append() { 11do_install_append() {
12 # remove qtquick1 translations - qtquick1 is gone 12 # remove qtquick1 translations - qtquick1 is gone
13 for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do 13 for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qmlviewer_*.qm -o -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do
14 rm $transfile 14 rm $transfile
15 done 15 done
16} 16}
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ 98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
99" 99"
100 100
101SRCREV = "ccb71797f2bc8f9ebd55954adc71370beed4165f" 101SRCREV = "c3f688fbdfaf633d7e6dd198865d4dc6cdef04b8"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 397d15f7..42f65682 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
71 71
72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
73 73
74SRCREV = "57b9af923b30ff301d60d86cf77fbbf1ab53bbbb" 74SRCREV = "932ae053ab9ea8aed974e8dde1bf7ef8524826a3"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 835d5929..2a7d3f75 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "1ed0782e93dafb0a3d5ef3a02c9c3999825817ee" 40SRCREV = "486c51912393bf56cae0e45931fb135579a930d3"
41 41
42BBCLASSEXTEND =+ "native nativesdk" 42BBCLASSEXTEND =+ "native nativesdk"
43 43
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 78d3183f..952825d5 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "e724c01be4a5abf093d936ec263a51d4dfa3ab18" 15SRCREV = "1f6c72df8b33741dc798042dd8c2e75f3af46232"
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 610b703f..e5e11036 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From 468ed461a955cc1ab3d890178546b79b9d001de9 Mon Sep 17 00:00:00 2001 1From f1db5849e2af526f1ec9297b42b4b1684f542a29 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -13,13 +13,26 @@ for the qmakes's host architecture.
13Upstream-Status: Inappropriate [OE specific] 13Upstream-Status: Inappropriate [OE specific]
14Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 14Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
15--- 15---
16 src/buildtools/config/linux.pri | 2 +-
16 src/buildtools/configure_host.pro | 14 +++++++------- 17 src/buildtools/configure_host.pro | 14 +++++++-------
17 src/buildtools/gn.pro | 4 ++-- 18 src/buildtools/gn.pro | 4 ++--
18 src/core/config/linux.pri | 2 +-
19 3 files changed, 10 insertions(+), 10 deletions(-) 19 3 files changed, 10 insertions(+), 10 deletions(-)
20 20
21diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
22index 998aedc..b04db36 100644
23--- a/src/buildtools/config/linux.pri
24+++ b/src/buildtools/config/linux.pri
25@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") {
26
27 host_build {
28 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
29- GN_HOST_CPU = $$gnArch($$QT_ARCH)
30+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
31 gn_args += host_cpu=\"$$GN_HOST_CPU\"
32 # Don't bother trying to use system libraries in this case
33 gn_args += use_glib=false
21diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 34diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
22index dd0d3e32..6312c867 100644 35index dd0d3e3..6312c86 100644
23--- a/src/buildtools/configure_host.pro 36--- a/src/buildtools/configure_host.pro
24+++ b/src/buildtools/configure_host.pro 37+++ b/src/buildtools/configure_host.pro
25@@ -4,7 +4,7 @@ TEMPLATE = aux 38@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -58,7 +71,7 @@ index dd0d3e32..6312c867 100644
58 " nm = \"$$which(nm)\" " \ 71 " nm = \"$$which(nm)\" " \
59 " toolchain_args = { " \ 72 " toolchain_args = { " \
60diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro 73diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
61index b6bf9cfc..ae419b1a 100644 74index 033202e..a8ca656 100644
62--- a/src/buildtools/gn.pro 75--- a/src/buildtools/gn.pro
63+++ b/src/buildtools/gn.pro 76+++ b/src/buildtools/gn.pro
64@@ -19,8 +19,8 @@ build_pass|!debug_and_release { 77@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
@@ -72,16 +85,3 @@ index b6bf9cfc..ae419b1a 100644
72 85
73 msvc:!clang_cl: gn_gen_args += --use-lto 86 msvc:!clang_cl: gn_gen_args += --use-lto
74 87
75diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
76index fcce4c31..e3384e58 100644
77--- a/src/core/config/linux.pri
78+++ b/src/core/config/linux.pri
79@@ -117,7 +117,7 @@ contains(QT_ARCH, "mips") {
80
81 host_build {
82 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
83- GN_HOST_CPU = $$gnArch($$QT_ARCH)
84+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
85 gn_args += host_cpu=\"$$GN_HOST_CPU\"
86 # Don't bother trying to use system libraries in this case
87 gn_args += use_glib=false
diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch
index 3047230c..0b312809 100644
--- a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch
@@ -1,23 +1,23 @@
1From a1c248259f3d8561d6e2c75a56edf4a72c393843 Mon Sep 17 00:00:00 2001 1From f8e556db0c49f31881ebefdb2ab28d2b22fccd5c Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 15 Aug 2019 07:52:53 +0300 3Date: Thu, 15 Aug 2019 07:52:53 +0300
4Subject: [PATCH] musl: allow build without glibc 4Subject: [PATCH] musl: allow build without glibc
5 5
6Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 6Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
7--- 7---
8 mkspecs/features/configure.prf | 2 +- 8 src/buildtools/config/support.pri | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 11diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
12index cc84182b..f1310f75 100644 12index 5bdd808..eda498f 100644
13--- a/mkspecs/features/configure.prf 13--- a/src/buildtools/config/support.pri
14+++ b/mkspecs/features/configure.prf 14+++ b/src/buildtools/config/support.pri
15@@ -75,7 +75,7 @@ defineTest(runConfigure) { 15@@ -89,7 +89,7 @@ defineTest(qtwebengine_checkErrorForLinux) {
16 return(false) 16 return(false)
17 } 17 }
18 18
19- !qtConfig(webengine-system-glibc) { 19- !qtConfig(webengine-system-glibc) {
20+ false:!qtConfig(webengine-system-glibc) { 20+ false:!qtConfig(webengine-system-glibc) {
21 skipBuild("A suitable version >= 2.27 of libc could not be found.") 21 qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.")
22 return(false) 22 return(false)
23 } 23 }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
deleted file mode 100644
index cc534fad..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ /dev/null
@@ -1,91 +0,0 @@
1From f290da1132af09f4cba13d5e551c75621b623247 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Feb 2019 19:28:59 -0800
4Subject: [PATCH] chromium: fix build with clang
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 chromium/build/config/compiler/BUILD.gn | 27 ++-----------------------
10 1 file changed, 2 insertions(+), 25 deletions(-)
11
12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
13index dbf94c9ab6b..6f2eff6f5ef 100644
14--- a/chromium/build/config/compiler/BUILD.gn
15+++ b/chromium/build/config/compiler/BUILD.gn
16@@ -570,13 +570,6 @@ config("compiler") {
17 }
18 }
19
20- # Tells the compiler not to use absolute paths when passing the default
21- # paths to the tools it invokes. We don't want this because we don't
22- # really need it and it can mess up the goma cache entries.
23- if (is_clang && !is_nacl) {
24- cflags += [ "-no-canonical-prefixes" ]
25- }
26-
27 # C11/C++11 compiler flags setup.
28 # ---------------------------
29 if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
30@@ -815,8 +808,6 @@ config("compiler_cpu_abi") {
31 }
32 } else if (current_cpu == "arm") {
33 if (is_clang && !is_android && !is_nacl) {
34- cflags += [ "--target=arm-linux-gnueabihf" ]
35- ldflags += [ "--target=arm-linux-gnueabihf" ]
36 }
37 if (!is_nacl) {
38 cflags += [
39@@ -829,8 +820,6 @@ config("compiler_cpu_abi") {
40 }
41 } else if (current_cpu == "arm64") {
42 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
43- cflags += [ "--target=aarch64-linux-gnu" ]
44- ldflags += [ "--target=aarch64-linux-gnu" ]
45 }
46 } else if (current_cpu == "mipsel" && !is_nacl) {
47 ldflags += [ "-Wl,--hash-style=sysv" ]
48@@ -839,9 +828,6 @@ config("compiler_cpu_abi") {
49 if (is_android) {
50 cflags += [ "--target=mipsel-linux-android" ]
51 ldflags += [ "--target=mipsel-linux-android" ]
52- } else {
53- cflags += [ "--target=mipsel-linux-gnu" ]
54- ldflags += [ "--target=mipsel-linux-gnu" ]
55 }
56 } else {
57 cflags += [ "-EL" ]
58@@ -920,10 +906,7 @@ config("compiler_cpu_abi") {
59 } else if (current_cpu == "mips" && !is_nacl) {
60 ldflags += [ "-Wl,--hash-style=sysv" ]
61 if (custom_toolchain == "") {
62- if (is_clang) {
63- cflags += [ "--target=mips-linux-gnu" ]
64- ldflags += [ "--target=mips-linux-gnu" ]
65- } else {
66+ if (!is_clang) {
67 cflags += [ "-EB" ]
68 ldflags += [ "-EB" ]
69 }
70@@ -970,9 +953,6 @@ config("compiler_cpu_abi") {
71 if (is_android) {
72 cflags += [ "--target=mips64el-linux-android" ]
73 ldflags += [ "--target=mips64el-linux-android" ]
74- } else {
75- cflags += [ "--target=mips64el-linux-gnuabi64" ]
76- ldflags += [ "--target=mips64el-linux-gnuabi64" ]
77 }
78 } else {
79 cflags += [
80@@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") {
81 } else if (current_cpu == "mips64") {
82 ldflags += [ "-Wl,--hash-style=sysv" ]
83 if (custom_toolchain == "") {
84- if (is_clang) {
85- cflags += [ "--target=mips64-linux-gnuabi64" ]
86- ldflags += [ "--target=mips64-linux-gnuabi64" ]
87- } else {
88+ if (!is_clang) {
89 cflags += [
90 "-EB",
91 "-mabi=64",
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
index e54cdc6b..4eba389f 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -1,4 +1,4 @@
1From 3cacf1082e11c8047a42eb74dfa0e34f37995d92 Mon Sep 17 00:00:00 2001 1From 07161d6cffe2f38f8de1d176047548ea448c0b8f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 5 Feb 2019 14:32:20 -0800 3Date: Tue, 5 Feb 2019 14:32:20 -0800
4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm 4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
@@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+), 1 deletion(-) 15 1 file changed, 4 insertions(+), 1 deletion(-)
16 16
17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn 17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
18index 458f428b7ce..18b4f23f769 100644 18index b9f1bba6062..354bd444482 100644
19--- a/chromium/third_party/zlib/BUILD.gn 19--- a/chromium/third_party/zlib/BUILD.gn
20+++ b/chromium/third_party/zlib/BUILD.gn 20+++ b/chromium/third_party/zlib/BUILD.gn
21@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { 21@@ -77,8 +77,11 @@ if (use_arm_neon_optimizations) {
22 # implement the CRC32* instructions. These are optional in ARMv8.0." 22 # Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
23 # - Fuchsia just added a syscall for feature detection. 23 # "All implementations of the ARMv8.1 architecture are required to
24 # TODO(cavalcantii): crbug.com/810125. 24 # implement the CRC32* instructions. These are optional in ARMv8.0."
25+ defines = [] 25+ defines = []
26 if (is_clang && (!is_ios && !is_fuchsia)) { 26 if (is_clang && !is_ios) {
27- defines = [ "CRC32_ARMV8_CRC32" ] 27- defines = [ "CRC32_ARMV8_CRC32" ]
28+ if (current_cpu == "arm64") { 28+ if (current_cpu == "arm64") {
29+ defines += [ "CRC32_ARMV8_CRC32" ] 29+ defines += [ "CRC32_ARMV8_CRC32" ]
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
index d8eca0c6..5f7901e8 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
@@ -1,4 +1,4 @@
1From 27d1c407b98979445e216c6fd105e78014e928b1 Mon Sep 17 00:00:00 2001 1From f49c5d488951027f1577f79681d448c3f30f6ae3 Mon Sep 17 00:00:00 2001
2From: Johannes Pointner <johannes.pointner@br-automation.com> 2From: Johannes Pointner <johannes.pointner@br-automation.com>
3Date: Fri, 3 May 2019 09:12:38 +0200 3Date: Fri, 3 May 2019 09:12:38 +0200
4Subject: [PATCH] chromium: Do not try to set the guessed values for 4Subject: [PATCH] chromium: Do not try to set the guessed values for
@@ -17,12 +17,12 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
17 1 file changed, 9 deletions(-) 17 1 file changed, 9 deletions(-)
18 18
19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
20index 6f2eff6f5ef..57a950a435a 100644 20index 127d0c444bd..b653e933d6f 100644
21--- a/chromium/build/config/compiler/BUILD.gn 21--- a/chromium/build/config/compiler/BUILD.gn
22+++ b/chromium/build/config/compiler/BUILD.gn 22+++ b/chromium/build/config/compiler/BUILD.gn
23@@ -809,15 +809,6 @@ config("compiler_cpu_abi") { 23@@ -749,15 +749,6 @@ config("compiler_cpu_abi") {
24 } else if (current_cpu == "arm") { 24 cflags += [ "--target=arm-linux-gnueabihf" ]
25 if (is_clang && !is_android && !is_nacl) { 25 ldflags += [ "--target=arm-linux-gnueabihf" ]
26 } 26 }
27- if (!is_nacl) { 27- if (!is_nacl) {
28- cflags += [ 28- cflags += [
@@ -35,4 +35,4 @@ index 6f2eff6f5ef..57a950a435a 100644
35- } 35- }
36 } else if (current_cpu == "arm64") { 36 } else if (current_cpu == "arm64") {
37 if (is_clang && !is_android && !is_nacl && !is_fuchsia) { 37 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
38 } 38 cflags += [ "--target=aarch64-linux-gnu" ]
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch
index e1754c1a..96eedc5f 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,4 +1,4 @@
1From 9f526ef03263867d7fb305d5fc91f95e2c9564ea Mon Sep 17 00:00:00 2001 1From 22793b4cab2ceaf7301136fa2df06947c9cb424c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 16:41:23 -0700 3Date: Fri, 7 Jul 2017 16:41:23 -0700
4Subject: [PATCH] chromium: musl: Adjust default pthread stack size 4Subject: [PATCH] chromium: musl: Adjust default pthread stack size
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 2 files changed, 4 insertions(+), 3 deletions(-) 10 2 files changed, 4 insertions(+), 3 deletions(-)
11 11
12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc 12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
13index 277a7e9338d..2a6e060fa32 100644 13index 095c49b8dc0..d1479b54d48 100644
14--- a/chromium/base/threading/platform_thread_linux.cc 14--- a/chromium/base/threading/platform_thread_linux.cc
15+++ b/chromium/base/threading/platform_thread_linux.cc 15+++ b/chromium/base/threading/platform_thread_linux.cc
16@@ -186,7 +186,8 @@ void TerminateOnThread() {} 16@@ -186,7 +186,8 @@ void TerminateOnThread() {}
@@ -24,10 +24,10 @@ index 277a7e9338d..2a6e060fa32 100644
24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the 24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the
25 // default stack size isn't enough for some browser tests. 25 // default stack size isn't enough for some browser tests.
26diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 26diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
27index 248f93968a6..4bc5ac692af 100644 27index b2421649ff3..a31b96e90e6 100644
28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
29+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 29+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
30@@ -30,7 +30,7 @@ size_t GetUnderestimatedStackSize() { 30@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size 31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
32 // correctly for the main thread. 32 // correctly for the main thread.
33 33
@@ -35,8 +35,8 @@ index 248f93968a6..4bc5ac692af 100644
35+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ 35+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
36 defined(OS_FUCHSIA) 36 defined(OS_FUCHSIA)
37 // pthread_getattr_np() can fail if the thread is not invoked by 37 // pthread_getattr_np() can fail if the thread is not invoked by
38 // pthread_create() (e.g., the main thread of webkit_unit_tests). 38 // pthread_create() (e.g., the main thread of blink_unittests).
39@@ -98,7 +98,7 @@ size_t GetUnderestimatedStackSize() { 39@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
40 } 40 }
41 41
42 void* GetStackStart() { 42 void* GetStackStart() {
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 4c93f704..c1c6b5a6 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -132,7 +132,7 @@ RDEPENDS_${PN}-examples += " \
132 qtdeclarative-qmlplugins \ 132 qtdeclarative-qmlplugins \
133" 133"
134 134
135QT_MODULE_BRANCH_CHROMIUM = "73-based" 135QT_MODULE_BRANCH_CHROMIUM = "75-based"
136 136
137# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13 137# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13
138# 5.13.meta-qt5.1 138# 5.13.meta-qt5.1
@@ -151,7 +151,6 @@ SRC_URI_append_libc-musl = "\
151SRC_URI += " \ 151SRC_URI += " \
152 file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ 152 file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
153 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ 153 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
154 file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
155 file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ 154 file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
156 file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ 155 file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
157 file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \ 156 file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \
@@ -173,8 +172,8 @@ SRC_URI_append_libc-musl = "\
173 file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 172 file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
174" 173"
175 174
176SRCREV_qtwebengine = "b44ed0fb99cd3d7047fcd322010c27cfa7989a18" 175SRCREV_qtwebengine = "b50e7669ea463a0c6d326b831dc816c939ff6398"
177SRCREV_chromium = "56c9ec96237de4c7787c643c7ac7ac4e00c9a1d1" 176SRCREV_chromium = "7ac85fb4cc6f44a21761a591ac497ae3d6bf966d"
178SRCREV = "${SRCREV_qtwebengine}" 177SRCREV = "${SRCREV_qtwebengine}"
179 178
180SRCREV_FORMAT = "qtwebengine_chromium" 179SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index 18657f75..8425a40c 100644
--- a/recipes-qt/qt5/qtwebglplugin_git.bb
+++ b/recipes-qt/qt5/qtwebglplugin_git.bb
@@ -18,4 +18,4 @@ do_configure_prepend() {
18 18
19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
20 20
21SRCREV = "7e9f4028c5ac856d9a307927528fd4065f8b4ff8" 21SRCREV = "64b88a7fbd90cb1f78eacf2a8fd1104876c32836"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 9cecffcb..59deb30b 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "24a9e0f961d84af037999771948d3d3d9c683a6c" 14SRCREV = "04c23a295d757c43c16f911fd25c912a78b57b62"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index bea1f210..041b1d0c 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "ca79ed44d8c5cfa4270d5eca824a76cbcb5887fe" 22SRCREV = "9f227c54605a2cfea23886532173896fa992ae57"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 3779f060..b5f40bec 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "a5c017a00bcaf4d68a1cb6cc8a937d7af63be09b" 15SRCREV = "58ee6c5866440b69f6a9d7a58f0fbeefbd578bc1"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index ed47ab35..cea507bb 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -25,7 +25,7 @@ do_configure_prepend() {
25 25
26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
27 27
28SRCREV = "61f18cc3619bbdeed47b0e161ff44089a6f82f0e" 28SRCREV = "af8b508de56fee70d6f3c971254fcb848805d18f"
29 29
30BBCLASSEXTEND =+ "native nativesdk" 30BBCLASSEXTEND =+ "native nativesdk"
31 31
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-08-25 03:01:31 +0000