summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/qmake5_base.bbclass6
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb7
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qt5.inc6
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb9
-rw-r--r--recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch (renamed from recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch)8
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch106
-rw-r--r--recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch41
-rw-r--r--recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch75
-rw-r--r--recipes-qt/qt5/qtbase_git.bb13
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_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/0002-Fix-memory-leak-in-V4.patch44
-rw-r--r--recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch84
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb4
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb5
-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/qtlocation_git.bb9
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb6
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb13
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-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/0002-assistant-help-fix-linking-of-dependent-libraries.patch29
-rw-r--r--recipes-qt/qt5/qttools_git.bb3
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-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.patch69
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch24
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch27
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch26
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch30
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch23
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch23
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb53
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch76
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb3
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
54 files changed, 190 insertions, 686 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index df8f6246..a556f4f9 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -214,7 +214,9 @@ qmake5_base_do_install() {
214 qmake5_base_fix_install ${STAGING_DIR_HOST} 214 qmake5_base_fix_install ${STAGING_DIR_HOST}
215 qmake5_base_fix_install ${STAGING_DIR_NATIVE} 215 qmake5_base_fix_install ${STAGING_DIR_NATIVE}
216 216
217 if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then 217 if ls ${D}${libdir}/pkgconfig/*.pc >/dev/null 2>/dev/null; then
218 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc 218 sed -i ${D}${libdir}/pkgconfig/*.pc \
219 -e "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" \
220 -e "s@${STAGING_DIR_TARGET}@@g"
219 fi 221 fi
220} 222}
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index f2ff5f7e..714b367e 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -27,9 +27,8 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
27# common for qtbase-native, qtbase-nativesdk and qtbase 27# common for qtbase-native, qtbase-nativesdk and qtbase
28SRC_URI += "\ 28SRC_URI += "\
29 file://0001-Add-linux-oe-g-platform.patch \ 29 file://0001-Add-linux-oe-g-platform.patch \
30 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
30 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 31 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
31 file://0003-Add-external-hostbindir-option.patch \
32 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
33 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 32 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
34 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 33 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
35 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 34 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
@@ -115,6 +114,7 @@ do_configure() {
115 -no-opengl \ 114 -no-opengl \
116 -no-openssl \ 115 -no-openssl \
117 -no-xcb \ 116 -no-xcb \
117 -no-feature-bearermanagement \
118 -no-icu \ 118 -no-icu \
119 -verbose \ 119 -verbose \
120 -release \ 120 -release \
@@ -134,7 +134,6 @@ do_configure() {
134 -testsdir ${OE_QMAKE_PATH_TESTS} \ 134 -testsdir ${OE_QMAKE_PATH_TESTS} \
135 -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ 135 -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \
136 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ 136 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \
137 -host-option CROSS_COMPILE=${HOST_PREFIX} \
138 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ 137 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
139 -no-glib \ 138 -no-glib \
140 -no-iconv \ 139 -no-iconv \
@@ -192,4 +191,4 @@ fakeroot do_generate_qt_environment_file() {
192 191
193addtask generate_qt_environment_file after do_install before do_package 192addtask generate_qt_environment_file after do_install before do_package
194 193
195SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980" 194SRCREV = "e1c8451ffeeaa82f29aa2519addfa377f678ed9e"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index f39208a8..882ab12a 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -34,6 +34,6 @@ do_configure_prepend() {
34 ${S}/src/quick3d/imports/input/importsinput.pro 34 ${S}/src/quick3d/imports/input/importsinput.pro
35} 35}
36 36
37SRCREV = "440589a0747d9668fec3ff924b390d75be5c6733" 37SRCREV = "4fb03dc1d50c9638b6045e1d99fbeff863662c2d"
38 38
39BBCLASSEXTEND += "native nativesdk" 39BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index f8649533..b7fee9c9 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.8" 5QT_MODULE_BRANCH ?= "5.9"
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
@@ -12,4 +12,4 @@ SRC_URI = " \
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
15PV = "5.8.0+git${SRCPV}" 15PV = "5.9.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 90d7896f..6f925244 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -97,19 +97,21 @@ FILES_${PN}-qmldesigner += " \
97 ${OE_QMAKE_PATH_QML}/*/*/*/designer \ 97 ${OE_QMAKE_PATH_QML}/*/*/*/designer \
98" 98"
99 99
100# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js} 100# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*.qmlc,*js}
101FILES_${PN}-qmlplugins = " \ 101FILES_${PN}-qmlplugins = " \
102 ${OE_QMAKE_PATH_QML}/*.qmltypes \ 102 ${OE_QMAKE_PATH_QML}/*.qmltypes \
103 ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ 103 ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
104 ${OE_QMAKE_PATH_QML}/*/qmldir \ 104 ${OE_QMAKE_PATH_QML}/*/qmldir \
105 ${OE_QMAKE_PATH_QML}/*/*.qmltypes \ 105 ${OE_QMAKE_PATH_QML}/*/*.qmltypes \
106 ${OE_QMAKE_PATH_QML}/*/*.qml \ 106 ${OE_QMAKE_PATH_QML}/*/*.qml \
107 ${OE_QMAKE_PATH_QML}/*/*.qmlc \
107 ${OE_QMAKE_PATH_QML}/*/*.js \ 108 ${OE_QMAKE_PATH_QML}/*/*.js \
108 ${OE_QMAKE_PATH_QML}/*/*.png \ 109 ${OE_QMAKE_PATH_QML}/*/*.png \
109 ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \ 110 ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \
110 ${OE_QMAKE_PATH_QML}/*/*/qmldir \ 111 ${OE_QMAKE_PATH_QML}/*/*/qmldir \
111 ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \ 112 ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \
112 ${OE_QMAKE_PATH_QML}/*/*/*.qml \ 113 ${OE_QMAKE_PATH_QML}/*/*/*.qml \
114 ${OE_QMAKE_PATH_QML}/*/*/*.qmlc \
113 ${OE_QMAKE_PATH_QML}/*/*/*.js \ 115 ${OE_QMAKE_PATH_QML}/*/*/*.js \
114 ${OE_QMAKE_PATH_QML}/*/*/*.png \ 116 ${OE_QMAKE_PATH_QML}/*/*/*.png \
115 ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \ 117 ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \
@@ -117,6 +119,7 @@ FILES_${PN}-qmlplugins = " \
117 ${OE_QMAKE_PATH_QML}/*/*/*/images \ 119 ${OE_QMAKE_PATH_QML}/*/*/*/images \
118 ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \ 120 ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \
119 ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ 121 ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \
122 ${OE_QMAKE_PATH_QML}/*/*/*/*.qmlc \
120 ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ 123 ${OE_QMAKE_PATH_QML}/*/*/*/*.js \
121 ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ 124 ${OE_QMAKE_PATH_QML}/*/*/*/*.png \
122 ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \ 125 ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \
@@ -124,6 +127,7 @@ FILES_${PN}-qmlplugins = " \
124 ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \ 127 ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \
125 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \ 128 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \
126 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \ 129 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \
130 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmlc \
127 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \ 131 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \
128 ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \ 132 ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \
129 ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \ 133 ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index da698129..7226c904 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -22,9 +22,8 @@ require qt5-git.inc
22# common for qtbase-native, qtbase-nativesdk and qtbase 22# common for qtbase-native, qtbase-nativesdk and qtbase
23SRC_URI += "\ 23SRC_URI += "\
24 file://0001-Add-linux-oe-g-platform.patch \ 24 file://0001-Add-linux-oe-g-platform.patch \
25 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
25 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 26 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
26 file://0003-Add-external-hostbindir-option.patch \
27 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
28 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 27 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
29 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 28 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
30 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 29 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
@@ -107,9 +106,7 @@ do_install() {
107 done 106 done
108 fi 107 fi
109 108
110 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) 109 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
111 # e.g. qt3d, qtwayland
112 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
113} 110}
114 111
115SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980" 112SRCREV = "e1c8451ffeeaa82f29aa2519addfa377f678ed9e"
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
index 8224171a..4ab47247 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
@@ -1,9 +1,9 @@
1From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f Mon Sep 17 00:00:00 2001 1From f49d55a883369dee488cc59feda29c770a803458 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH] Add -external-hostbindir option 4Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
5 5
6* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries 6... to determine path to host binaries
7 7
8Upstream-Status: Inappropriate [OE specific] 8Upstream-Status: Inappropriate [OE specific]
9 9
@@ -19,7 +19,7 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2
19 3 files changed, 6 insertions(+), 6 deletions(-) 19 3 files changed, 6 insertions(+), 6 deletions(-)
20 20
21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
22index a5ed8b2..0e11a1e 100644 22index 545b9a3..c991a9b 100644
23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
24+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 24+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
25@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 25@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
deleted file mode 100644
index c105488e..00000000
--- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ /dev/null
@@ -1,106 +0,0 @@
1From bf1498618415e7b1e57b54881b1e56d74f2cdf6b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9* in situation like this:
10 QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
11 QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
12 QT_INSTALL_LIBS/raw:/usr/lib
13 QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
14
15 I don't want the replacement like this:
16 sed
17 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
18 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
19 "../../lib/pkgconfig/Qt5Core.pc"
20 >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
21 because that way I'll end with -L/usr/lib in .pc file which is
22 cross-compile unfriendly, keeping ${libdir}/${includedir} works better
23 in my case
24
25* qt_module: Fix paths in .prl files
26* qmake does not prefix them with QT_SYSROOT when using them
27 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
28 variable, which is unsafe for cross-compilation
29* writting QT_SYSROOT in .prl files is dangerous for sstate when
30 builds are in different directories, so we need
31 SSTATE_SCAN_FILES += "*.pri *.prl"
32 to make them relocateble
33
34* fix paths in packageconfig files
35 This reverts parts of:
36
37 enable path replacement in installed prl files on all platforms
38
39 Task-number: QTBUG-33794
40 Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b
41 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
42
43* to debug this, rebuild qtbase and read build/src/corelib/Makefile
44* this is example of broken install_target rule (added line feeds):
45 -$(SED) -e s,/OE/5.3.1-r0/build/lib,/usr/lib,g
46 -e 's,/OE/5.3.1-r0/build/include,$$\{includedir},g'
47 -e 's,/OE/5.3.1-r0/build/lib,$$\{libdir},g'
48 "../../lib/pkgconfig/Qt5Core.pc"
49 >"$(INSTALL_ROOT)/usr/lib/pkgconfig/Qt5Core.pc"
50 change .prf files, create copy of WORKDIR, re-excecute only
51 do_configure task and compare generated Makefile, repeat until
52 replace in generated Makefile works ok, then refresh patch and
53 try complete rebuild for qtbase
54* if everything is ok, then try:
55 image $ grep -R "\-L/usr" .
56 image $ grep -R "\-I/usr" .
57 and it should return only few cases of
58 qmake.conf:QMAKE_LFLAGS_THREAD = -L/usr/lib/threads
59 for aix* platformas
60
61Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c
62Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
63Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
64Signed-off-by: Jonathan Liu <net147@gmail.com>
65---
66 mkspecs/features/qt.prf | 13 +++++++++++++
67 mkspecs/features/qt_common.prf | 2 +-
68 2 files changed, 14 insertions(+), 1 deletion(-)
69
70diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
71index 0c5f080..a6e4f09 100644
72--- a/mkspecs/features/qt.prf
73+++ b/mkspecs/features/qt.prf
74@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) {
75 QTPLUGIN = $$manualplugs $$autoplugs
76 }
77
78+contains(TEMPLATE, .*lib) {
79+ pkgconfig_prefix_replace.match = "prefix=$$[QT_SYSROOT]"
80+ pkgconfig_prefix_replace.replace = "prefix="
81+ pkgconfig_prefix_replace.CONFIG = path
82+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_prefix_replace
83+
84+ # drop -L/usr/lib in .prl files
85+ prl_replace.match = "-L\$${libdir}"
86+ prl_replace.replace = ""
87+ prl_replace.CONFIG = path
88+ QMAKE_PRL_INSTALL_REPLACE += prl_replace
89+}
90+
91 QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN
92 qtConfig(static) {
93 QT_PLUGIN_VERIFY += QTPLUGIN
94diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
95index e754a17..4c1530e 100644
96--- a/mkspecs/features/qt_common.prf
97+++ b/mkspecs/features/qt_common.prf
98@@ -37,7 +37,7 @@ contains(TEMPLATE, .*lib) {
99 lib_replace.replace =
100 } else {
101 lib_replace.match = $$rplbase/lib
102- lib_replace.replace = $$qqt_libdir
103+ lib_replace.replace = "\$$\\{libdir}"
104 }
105 lib_replace.CONFIG = path
106 QMAKE_PRL_INSTALL_REPLACE += lib_replace
diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
index d455d2cd..7c80c6b9 100644
--- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
1From 60f490b57faf979a912074506a75c74767a27d3b Mon Sep 17 00:00:00 2001 1From c8f856115df0f5be64dfbeef0c1e9a4f02ba161a 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
@@ -8,26 +8,27 @@ from 256 to 512 characters, as nativesdk path can be quite long.
8 8
9Also update length of EXT_PREFIX and HOST_PREFIX now. 9Also update length of EXT_PREFIX and HOST_PREFIX now.
10 10
11Change-Id: If98dd57160efe9c98c36148cdf872f50b3d38118
11Signed-off-by: Denys Dmytriyenko <denys@ti.com> 12Signed-off-by: Denys Dmytriyenko <denys@ti.com>
12--- 13---
13 configure | 6 +++--- 14 configure.pri | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-) 15 1 file changed, 3 insertions(+), 3 deletions(-)
15 16
16diff --git a/configure b/configure 17diff --git a/configure.pri b/configure.pri
17index 1fcbb3a..f49a674 100755 18index efd0f81..5a027fe 100644
18--- a/configure 19--- a/configure.pri
19+++ b/configure 20+++ b/configure.pri
20@@ -3847,10 +3847,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ 21@@ -837,10 +837,10 @@ defineTest(qtConfOutput_preparePaths) {
21 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; 22 "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \
22 23 "" \
23 /* Installation Info */ 24 "/* Installation Info */" \
24-static const char qt_configure_prefix_path_str [256 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; 25- "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \
25+static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; 26+ "static const char qt_configure_prefix_path_str [12+512] = \"qt_prfxpath=$$config.input.prefix\";" \
26 #ifdef QT_BUILD_QMAKE 27 "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
27-static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; 28- "static const char qt_configure_ext_prefix_path_str [12+256] = \"qt_epfxpath=$$config.input.extprefix\";" \
28-static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX"; 29- "static const char qt_configure_host_prefix_path_str [12+256] = \"qt_hpfxpath=$$config.input.hostprefix\";" \
29+static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; 30+ "static const char qt_configure_ext_prefix_path_str [12+512] = \"qt_epfxpath=$$config.input.extprefix\";" \
30+static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX"; 31+ "static const char qt_configure_host_prefix_path_str [12+512] = \"qt_hpfxpath=$$config.input.hostprefix\";" \
31 #endif 32 "$${LITERAL_HASH}endif" \
32 33 "" \
33 static const short qt_configure_str_offsets[] = { 34 "static const short qt_configure_str_offsets[] = {" \
diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
deleted file mode 100644
index 6d64e6b5..00000000
--- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From cc926956758bf8170c4e49c66e1066524b43f65f Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 13 Nov 2015 12:36:11 +0100
4Subject: [PATCH] configure paths for target qmake properly
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9to use this patch in all qtbase/qtbase-native(sdk) changes ore made
10conditionally based on QT_CROSS_COMPILE
11
12Upstream-Status: Inappropriate [OE specific]
13
14Change-Id: I2b2f00c496216e98fbe14801f9e840ef5333c4b6
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 configure | 23 +++++++++++++++++++----
19 1 file changed, 19 insertions(+), 4 deletions(-)
20
21diff --git a/configure b/configure
22index 8b33c5b..1df248f 100755
23--- a/configure
24+++ b/configure
25@@ -1545,8 +1545,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then
26 fi
27 fi
28
29-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
30-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
31+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
32+ shortxspec=linux-g++
33+ shortspec=linux-g++
34+else
35+ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
36+ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
37+fi
38
39 QT_CONFIGURE_STR_OFF=0
40
41@@ -1579,7 +1584,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
42
43 QT_CONFIGURE_STR_OFFSETS=
44 QT_CONFIGURE_STRS=
45-addConfStr "$CFG_SYSROOT"
46+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
47+ addConfStr ""
48+else
49+ addConfStr "$CFG_SYSROOT"
50+fi
51 addConfStr "$QT_REL_HOST_BINS"
52 addConfStr "$QT_REL_HOST_LIBS"
53 addConfStr "$QT_REL_HOST_DATA"
54@@ -1591,6 +1600,12 @@ addConfStr "$shortspec"
55 #-------------------------------------------------------------------------------
56 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
57
58+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
59+ QT_TARGET_PREFIX=$QT_EXT_PREFIX
60+else
61+ QT_TARGET_PREFIX=$QT_HOST_PREFIX
62+fi
63+
64 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
65 /* Installation date */
66 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
67@@ -1599,7 +1614,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
68 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
69 #ifdef QT_BUILD_QMAKE
70 static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
71-static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
72+static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX";
73 #endif
74
75 static const short qt_configure_str_offsets[] = {
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 27d0de1a..8a90b4eb 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -17,19 +17,13 @@ LIC_FILES_CHKSUM = " \
17# common for qtbase-native, qtbase-nativesdk and qtbase 17# common for qtbase-native, qtbase-nativesdk and qtbase
18SRC_URI += "\ 18SRC_URI += "\
19 file://0001-Add-linux-oe-g-platform.patch \ 19 file://0001-Add-linux-oe-g-platform.patch \
20 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
20 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 21 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
21 file://0003-Add-external-hostbindir-option.patch \
22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
23 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 22 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
24 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 23 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
25 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 24 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
26" 25"
27 26
28# only for target qtbase
29SRC_URI += "\
30 file://0008-configure-paths-for-target-qmake-properly.patch \
31"
32
33DEPENDS += "qtbase-native" 27DEPENDS += "qtbase-native"
34 28
35# LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp 29# LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp
@@ -40,7 +34,7 @@ RDEPENDS_${PN}-tools += "perl"
40# separate some parts of PACKAGECONFIG which are often changed 34# separate some parts of PACKAGECONFIG which are often changed
41PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 35PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
42PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 36PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
43PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb xkbcommon-evdev', '', d)}" 37PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xinput2 glib xkb xkbcommon-evdev', '', d)}"
44PACKAGECONFIG_FONTS ?= "" 38PACKAGECONFIG_FONTS ?= ""
45PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" 39PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
46PACKAGECONFIG_DISTRO ?= "" 40PACKAGECONFIG_DISTRO ?= ""
@@ -104,7 +98,6 @@ PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2"
104PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite" 98PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite"
105PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3" 99PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3"
106PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi" 100PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi"
107PACKAGECONFIG[xrender] = "-xrender,-no-xrender,libxrender"
108PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" 101PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv"
109PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" 102PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon"
110PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config" 103PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config"
@@ -189,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
189 182
190RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 183RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
191 184
192SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980" 185SRCREV = "e1c8451ffeeaa82f29aa2519addfa377f678ed9e"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 3ca66472..21c39531 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "5962967a3712ee711fd9ab58da664a3eb0acb24e" 13SRCREV = "08458d0dcfba8421c03ed9c7dec7435619f0b70d"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 1369deee..c6f0d3da 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "057b3e2d6a96b42b890a0d007a8801d260c3de48" 11SRCREV = "cc4e79d6200b0495a5c4d1a7faa773906b1ac99e"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index de7764d8..a1ac8b9c 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -23,4 +23,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
23 23
24EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 24EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
25 25
26SRCREV = "1afb57ed92a25bbc000ea4c4d7662cb8b9e267ee" 26SRCREV = "60d27ebd2977eee384461469053755c6ba36f102"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 7d6a51fc..53792794 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 = "a78f8d6bef57dd4283094a52551705ee02909970" 11SRCREV = "73ec35fa12a4b150670ea93d3021ca8e658063e1"
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch b/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch
deleted file mode 100644
index 423681ee..00000000
--- a/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 80e63c5a2981473dd7ee3a4f382e54948bb99f75 Mon Sep 17 00:00:00 2001
2From: Gunnar Sletta <gunnar@crimson.no>
3Date: Thu, 19 Jan 2017 09:05:46 +0100
4Subject: [PATCH 2/3] Fix memory leak in V4
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Transitions contain both an id and a set of flags, but the sorting
10failed to take the flags into account in the operator<. As a result
11we would some times end up with duplicate entries if the same id
12was added multiple times with different flags.
13
14If the same id was added again and again with varying flags, this
15could lead to an ever expanding list filled with duplicate entries.
16
17Fix this by also taking flags into account in operator< so that
18operator< and operator== are symetric and the list gets correctly
19sorted.
20
21Change-Id: I762ec3f0c5b4ed9a1aecb9a883187a0445491591
22Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
23Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
24Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
25---
26 src/qml/jsruntime/qv4internalclass_p.h | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/src/qml/jsruntime/qv4internalclass_p.h b/src/qml/jsruntime/qv4internalclass_p.h
30index dcda949..1d8ef4b 100644
31--- a/src/qml/jsruntime/qv4internalclass_p.h
32+++ b/src/qml/jsruntime/qv4internalclass_p.h
33@@ -234,7 +234,7 @@ struct InternalClassTransition
34 { return id == other.id && flags == other.flags; }
35
36 bool operator<(const InternalClassTransition &other) const
37- { return id < other.id; }
38+ { return id < other.id || (id == other.id && flags < other.flags); }
39 };
40
41 struct InternalClass : public QQmlJS::Managed {
42--
432.9.3
44
diff --git a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch b/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch
deleted file mode 100644
index 79a48f54..00000000
--- a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch
+++ /dev/null
@@ -1,84 +0,0 @@
1From 6aa9001064c19e75e58c830eedc583e2342a7f20 Mon Sep 17 00:00:00 2001
2From: Shawn Rutledge <shawn.rutledge@qt.io>
3Date: Wed, 1 Feb 2017 12:06:26 +0100
4Subject: [PATCH 3/3] fix memory leak in
5 QQuickWindowPrivate::deliverTouchAsMouse
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10A QTouchEvent is allocated with a reduced subset of TouchPoints for
11each Item to which we attempt to deliver it, and thrown away afterwards.
12(Ιt's not efficient to heap-allocate it, but we can't avoid doing it
13at all without changing behavior.) So now it's stored in a QScopedPointer.
14
15Change-Id: I48badb493610d0a715e582a2eedae95e2006eb2b
16Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
17Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
18---
19 src/quick/items/qquickwindow.cpp | 14 +++++++-------
20 1 file changed, 7 insertions(+), 7 deletions(-)
21
22diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
23index 1297dde..c130aec 100644
24--- a/src/quick/items/qquickwindow.cpp
25+++ b/src/quick/items/qquickwindow.cpp
26@@ -629,8 +629,8 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
27
28 // FIXME: make this work for mouse events too and get rid of the asTouchEvent in here.
29 Q_ASSERT(pointerEvent->asPointerTouchEvent());
30- QTouchEvent *event = pointerEvent->asPointerTouchEvent()->touchEventForItem(item);
31- if (!event)
32+ QScopedPointer<QTouchEvent> event(pointerEvent->asPointerTouchEvent()->touchEventForItem(item));
33+ if (event.isNull())
34 return false;
35
36 // For each point, check if it is accepted, if not, try the next point.
37@@ -647,7 +647,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
38 break;
39
40 qCDebug(DBG_TOUCH_TARGET) << "TP (mouse)" << p.id() << "->" << item;
41- QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event, item, false));
42+ QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event.data(), item, false));
43
44 // Send a single press and see if that's accepted
45 QCoreApplication::sendEvent(item, mousePress.data());
46@@ -661,7 +661,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
47 pointerEventPoint->setGrabber(item);
48
49 if (checkIfDoubleClicked(event->timestamp())) {
50- QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event, item, false));
51+ QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event.data(), item, false));
52 QCoreApplication::sendEvent(item, mouseDoubleClick.data());
53 event->setAccepted(mouseDoubleClick->isAccepted());
54 if (!mouseDoubleClick->isAccepted()) {
55@@ -678,7 +678,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
56 } else if (touchMouseDevice == device && p.id() == touchMouseId) {
57 if (p.state() & Qt::TouchPointMoved) {
58 if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) {
59- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event, mouseGrabberItem, false));
60+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), mouseGrabberItem, false));
61 QCoreApplication::sendEvent(item, me.data());
62 event->setAccepted(me->isAccepted());
63 if (me->isAccepted()) {
64@@ -689,7 +689,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
65 // no grabber, check if we care about mouse hover
66 // FIXME: this should only happen once, not recursively... I'll ignore it just ignore hover now.
67 // hover for touch???
68- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event, item, false));
69+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), item, false));
70 if (lastMousePosition.isNull())
71 lastMousePosition = me->windowPos();
72 QPointF last = lastMousePosition;
73@@ -707,7 +707,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
74 } else if (p.state() & Qt::TouchPointReleased) {
75 // currently handled point was released
76 if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) {
77- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event, mouseGrabberItem, false));
78+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event.data(), mouseGrabberItem, false));
79 QCoreApplication::sendEvent(item, me.data());
80
81 if (item->acceptHoverEvents() && p.screenPos() != QGuiApplicationPrivate::lastCursorPosition) {
82--
832.9.3
84
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index c19bbd56..d4c711e0 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -16,8 +16,6 @@ LIC_FILES_CHKSUM = " \
16 16
17SRC_URI += " \ 17SRC_URI += " \
18 file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \ 18 file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \
19 file://0002-Fix-memory-leak-in-V4.patch \
20 file://0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch \
21" 19"
22 20
23DEPENDS += "qtbase" 21DEPENDS += "qtbase"
@@ -38,6 +36,6 @@ do_install_append_class-nativesdk() {
38 36
39EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 37EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
40 38
41SRCREV = "fffb997e192a72b4dcd66edc2fbad5473dd359f3" 39SRCREV = "1bee1eb0f80ca099945e60c113d24f7fa1e0ef29"
42 40
43BBCLASSEXTEND =+ "native nativesdk" 41BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 2f32a884..8b4fb714 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -15,8 +15,3 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
15QT_MODULE_BRANCH = "dev" 15QT_MODULE_BRANCH = "dev"
16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" 16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
17 17
18do_install_append() {
19 if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then
20 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Enginio.pc
21 fi
22}
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 6abf8b77..2174f802 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 = "13bbe6ea378d127b9b1d70e2858e41e86e754dc7" 17SRCREV = "c7f84dfc27f3afc9a8f4a8bacb8d036d090bb49c"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index f4b43e75..d0d46e5d 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -19,4 +19,4 @@ DEPENDS += "qtdeclarative"
19 19
20RDEPENDS_${PN}-dev = "" 20RDEPENDS_${PN}-dev = ""
21 21
22SRCREV = "1583bb5569cfc50141d879107a46146d5ccccf28" 22SRCREV = "e66fd901fb9e18d45182db56ec3ce70f401d2ac4"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 3725441c..024519ef 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
26 26
27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
28 28
29SRCREV = "cd2de115c6216ad747cf4803e65a4ce4af220795" 29SRCREV = "c7a6a451a5c277556e28dfb3b4b943719cdda7ff"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index f25d57ef..4c058286 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -20,4 +20,11 @@ PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy"
20 20
21EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 21EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
22 22
23SRCREV = "41cc347040226d2c5c16b9df001d03f2724b87e5" 23SRC_URI += " \
24 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
25 "
26
27SRCREV_qtlocation = "453fab84c606328811bafd4de9cde5564620fdc6"
28SRCREV_qtlocation-mapboxgl = "fa9e435795a958b44d50a5cd9cfb4a83363c1923"
29
30SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 7d3c3cc0..7c90c49b 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -33,4 +33,4 @@ SRC_URI += "\
33 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ 33 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
34" 34"
35 35
36SRCREV = "544a8a4251ff9694780e563ddb6e4af1325e0115" 36SRCREV = "6de2c8aca6736550d87057b0a3f025464bf21246"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 5657c869..2ba626de 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -10,4 +10,4 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase" 11DEPENDS += "qtbase"
12 12
13SRCREV = "ec7663382bc6382323f3261ab199ec2edbeb5e37" 13SRCREV = "031ab0ce77da942d12e84cb18a76be71f7533544"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index e9b6185e..2f16a36f 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -23,4 +23,4 @@ do_configure_prepend() {
23} 23}
24 24
25QT_MODULE_BRANCH = "dev" 25QT_MODULE_BRANCH = "dev"
26SRCREV = "64faeb0d8003e699a4d09e7dcee1ef6eb10302ad" 26SRCREV = "695460401d9a89d2f156016d51601b2e59b64105"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 42acb8ad..5b841f79 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -4,10 +4,10 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" 4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
7 file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \ 7 file://LICENSE.LGPLv3;md5=382747d0119037529ec2b98b24038eb0 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 8 file://LICENSE.GPLv3;md5=dce746aa5261707df6d6999ab9958d8b \
9" 9"
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "6f7852a307c7ebbdb3b6efa00cbf7626b072bbc1" 13SRCREV = "2e8922b144e7308d6895528977b9e94b13b5e902"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 69f3d3ba..f566e156 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,8 +17,19 @@ DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = "" 18RDEPENDS_${PN}-dev = ""
19 19
20FILES_${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \
22 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders/* \
23 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders/+hlsl \
24 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders/+hlsl/* \
25 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders/+glslcore \
26 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders/+glslcore/* \
27 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Private/*.jsc \
28 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
29"
30
20SRC_URI += " \ 31SRC_URI += " \
21 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 32 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
22" 33"
23 34
24SRCREV = "201c86391c7ff78d570fdec6e0c0b71eb1e9aae4" 35SRCREV = "751f08cf46f505980b8ebe9a228a6c229b470152"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 3f8b64a2..ae5e0da4 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
25 25
26DEPENDS += "qtbase" 26DEPENDS += "qtbase"
27 27
28SRCREV = "c35df2ec0ee05351912e768d298a7c627dbdd1ef" 28SRCREV = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index d69d00fe..93cff7d4 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "4704292500b98143eee9b0fb0b6a34a858ed1253" 13SRCREV = "e9406368d46e806835c703e387b00598647cd446"
14 14
15SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" 15SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
16 16
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 93a09719..6dd0e0fe 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase qtdeclarative" 14DEPENDS += "qtbase qtdeclarative"
15 15
16SRCREV = "1220a31e6c2f91b34b4a05773621dddab8c4315a" 16SRCREV = "760e62003843e79d0b9d56cfb1a64d4d86992b99"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 325d9754..2d94982e 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 = "c8fe92ef54b2d310e8c8c143962fd6f43bf46c27" 14SRCREV = "0ac7bc6e57be2a7c2ee14bfaf7489e20daf3edc0"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index edecc041..76e6dd6f 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "74aad2578ecb6739007449a06a54dd7abd64c85b" 18SRCREV = "d320f01018f0273e4fea2e0a7aa8f30ee8129587"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 24a0d911..3c65c97e 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 = "1b3a7ae14d25f1caa3f6bedad3cfeb7d83b3904e" 15SRCREV = "e4038c6a3696973aca6db7f5442a8fb00a9b5bab"
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
deleted file mode 100644
index 17d5d514..00000000
--- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 95a418157ce5f49052ec1c349581d1811a79c9eb Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 17 Jan 2014 14:33:19 +0100
4Subject: [PATCH] assistant/help: fix linking of dependent libraries
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get:
10| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link)
11| ...undefined reference to `QCLucenePhraseQuery::getTerms() const'
12
13Upstream-Status: Inappropriate [configuration]
14
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16---
17 src/assistant/help/help.pro | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
21index 37d5ba4..8de8763 100644
22--- a/src/assistant/help/help.pro
23+++ b/src/assistant/help/help.pro
24@@ -60,3 +60,5 @@ HEADERS += qhelpsearchindexwriter_clucene_p.h \
25 qhelpsearchindexreader_clucene_p.h
26
27 load(qt_module)
28+
29+LIBS += -lQt5CLucene
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 5c0f51cc..51963027 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -20,7 +20,6 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
20 20
21SRC_URI += " \ 21SRC_URI += " \
22 file://run-ptest \ 22 file://run-ptest \
23 file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
24 file://0003-add-noqtwebkit-configuration.patch \ 23 file://0003-add-noqtwebkit-configuration.patch \
25 file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \ 24 file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \
26" 25"
@@ -33,7 +32,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
33 32
34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
35 34
36SRCREV = "30c10900adecca55faa1d59c2f0caac74b1f9df6" 35SRCREV = "5c7b771829c52400ddd8f441972b37ce92da3b78"
37 36
38BBCLASSEXTEND = "native nativesdk" 37BBCLASSEXTEND = "native nativesdk"
39 38
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 53ab1996..a76f5c4b 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \
114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
115" 115"
116 116
117SRCREV = "c0ae29b2328922f16cb2305f8579c2a869c871b0" 117SRCREV = "365bfb2ef769241e798b7c222a63ff68348d87c7"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 08914b19..1a735d62 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"
49 49
50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
51 51
52SRCREV = "cfa4ab4cbf13971d4b71ee920353822755a3bf31" 52SRCREV = "0e27ca2c843d4e1b29276a8e175ce3360b6aecca"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index bcddb32c..2ed11ec4 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -41,7 +41,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
41 41
42EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 42EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
43 43
44SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e" 44SRCREV = "c26f8dbd5c5ff15167e90db529845091705cbe46"
45 45
46# From https://bugreports.qt.io/browse/QTBUG-57767 46# From https://bugreports.qt.io/browse/QTBUG-57767
47SRC_URI += " \ 47SRC_URI += " \
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index d5f86850..724a6a61 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \
17 17
18DEPENDS += "qtdeclarative qtwebsockets" 18DEPENDS += "qtdeclarative qtwebsockets"
19 19
20SRCREV = "e3ddde4b26a72d57beeeed4e2d3384896e3a399d" 20SRCREV = "4a95a4e603e1bfd8e365274a5888dcdbb6bb42e7"
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
new file mode 100644
index 00000000..130f3a38
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -0,0 +1,69 @@
1From 5c879db32cde9bee9c9073842ecc281172f19453 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration
5
6Force gcc/g++ to be used for parts using host toolchain, since
7the option(host_build) does not work in yocto builds.
8
9Upstream-Status: Inappropriate [OE specific]
10Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
11---
12 src/buildtools/configure_host.pro | 12 ++++++------
13 1 file changed, 6 insertions(+), 6 deletions(-)
14
15diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
16index d8d731d..89dade4 100644
17--- a/src/buildtools/configure_host.pro
18+++ b/src/buildtools/configure_host.pro
19@@ -16,9 +16,9 @@ GN_CONTENTS = \
20 "import(\"//build/config/sysroot.gni\")" \
21 "import(\"//build/toolchain/gcc_toolchain.gni\")" \
22 "gcc_toolchain(\"host\") {" \
23-" cc = \"$$which($$QMAKE_CC)\" " \
24-" cxx = \"$$which($$QMAKE_CXX)\" " \
25-" ld = \"$$which($$QMAKE_LINK)\" " \
26+" cc = \"$$which(gcc)\" " \
27+" cxx = \"$$which(g++)\" " \
28+" ld = \"$$which(g++)\" " \
29 " ar = \"$$which(ar)\" " \
30 " nm = \"$$which(nm)\" " \
31 " toolchain_args = { " \
32@@ -27,9 +27,9 @@ GN_CONTENTS = \
33 " } " \
34 "}" \
35 "gcc_toolchain(\"v8_snapshot\") {" \
36-" cc = \"$$which($$QMAKE_CC)\" " \
37-" cxx = \"$$which($$QMAKE_CXX)\" " \
38-" ld = \"$$which($$QMAKE_LINK)\" " \
39+" cc = \"$$which(gcc)\" " \
40+" cxx = \"$$which(g++)\" " \
41+" ld = \"$$which(g++)\" " \
42 " ar = \"$$which(ar)\" " \
43 " nm = \"$$which(nm)\" " \
44 " toolchain_args = { " \
45diff --git a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
46index 75b9690..601f688 100755
47--- a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
48+++ b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
49@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options):
50 ld = os.environ.get('LD', 'link.exe')
51 ar = os.environ.get('AR', 'lib.exe')
52 else:
53- cc = os.environ.get('CC', 'cc')
54- cxx = os.environ.get('CXX', 'c++')
55+ cc = os.environ.get('CC_host', 'cc')
56+ cxx = os.environ.get('CXX_host', 'c++')
57 ld = cxx
58- ar = os.environ.get('AR', 'ar')
59+ ar = os.environ.get('AR_host', 'ar')
60
61- cflags = os.environ.get('CFLAGS', '').split()
62- cflags_cc = os.environ.get('CXXFLAGS', '').split()
63- ldflags = os.environ.get('LDFLAGS', '').split()
64+ cflags = os.environ.get('CFLAGS_host', '').split()
65+ cflags_cc = os.environ.get('CXXFLAGS_host', '').split()
66+ ldflags = os.environ.get('LDFLAGS_host', '').split()
67 include_dirs = [root_gen_dir, SRC_ROOT]
68 libs = []
69
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
deleted file mode 100644
index ccd43e21..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From db56cd0fd185a9f3858f5aa6e95b24e63dee119f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 3 Oct 2014 03:52:11 +0200
4Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc
5 when building for x64 arch
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 src/3rdparty/chromium/base/base.gypi | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi
13index 63c3f76..331c975 100644
14--- a/src/3rdparty/chromium/base/base.gypi
15+++ b/src/3rdparty/chromium/base/base.gypi
16@@ -801,7 +801,7 @@
17 ['include', '^nix/'],
18 ],
19 }],
20- ['use_qt==1 and target_arch=="ia32"', {
21+ ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', {
22 'sources/': [
23 ['include', 'atomicops_internals_x86_gcc.cc'],
24 ],
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
deleted file mode 100644
index b7bd5a4a..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 793db05d66b7a92ebe069dc76093487489dd8b69 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 30 Jun 2014 20:08:17 +0200
4Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
5 anywhere in path, but at the end
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 tools/qmake/mkspecs/features/functions.prf | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
13index 20fb278..7aa0b4a 100644
14--- a/tools/qmake/mkspecs/features/functions.prf
15+++ b/tools/qmake/mkspecs/features/functions.prf
16@@ -168,9 +168,9 @@ defineReplace(mocOutput) {
17 out = $$1
18 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
19 for(ext, $$list($${QMAKE_EXT_CPP})): \
20- out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
21+ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
22 for(ext, $$list($${QMAKE_EXT_H})): \
23- out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
24+ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
25 return($$out)
26 }
27
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
deleted file mode 100644
index e487c6a5..00000000
--- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From aa5bb11072bc0e441dc6533f53ed5359c5000088 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH] functions.prf: Make sure we only use the file name to
5 generate it's moc'ed abbreviation
6
7Signed-off-by: Simon Busch <morphis@gravedo.de>
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 tools/qmake/mkspecs/features/functions.prf | 3 ++-
11 1 file changed, 2 insertions(+), 1 deletion(-)
12
13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
14index 7aa0b4a..9b3a639 100644
15--- a/tools/qmake/mkspecs/features/functions.prf
16+++ b/tools/qmake/mkspecs/features/functions.prf
17@@ -165,7 +165,8 @@ defineReplace(findIncludedMocFiles) {
18 }
19
20 defineReplace(mocOutput) {
21- out = $$1
22+ in = $$1
23+ out = $$basename(in)
24 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
25 for(ext, $$list($${QMAKE_EXT_CPP})): \
26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
deleted file mode 100644
index 786a383d..00000000
--- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 6918d25c54ec4bc17a9b612c0d24b0f01be3aca1 Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
5
6Upstream-Status: Inappropriate [OE specific]
7
8Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de>
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 tools/qmake/mkspecs/features/functions.prf | 6 ++++++
12 1 file changed, 6 insertions(+)
13
14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
15index 9b3a639..dc5ed1c 100644
16--- a/tools/qmake/mkspecs/features/functions.prf
17+++ b/tools/qmake/mkspecs/features/functions.prf
18@@ -5,6 +5,12 @@ defineTest(isPlatformSupported) {
19 return(false)
20 }
21 gcc:!clang:!isGCCVersionSupported(): return(false)
22+ } else:linux-oe-g++* {
23+ !gcc:!clang {
24+ skipBuild("Qt WebEngine on Linux requires clang or GCC.")
25+ return(false)
26+ }
27+ gcc:!clang:!isGCCVersionSupported(): return(false)
28 } else:win32 {
29 winrt {
30 skipBuild("WinRT is not supported.")
diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
deleted file mode 100644
index d10ddf7f..00000000
--- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From 6ed60f35761ab268004727be544e9ccf70594211 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7---
8 src/webengine/api/qquickwebengineview_p_p.h | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
12index f13bfd0..0e12244 100644
13--- a/src/webengine/api/qquickwebengineview_p_p.h
14+++ b/src/webengine/api/qquickwebengineview_p_p.h
15@@ -60,6 +60,8 @@
16 #include <QString>
17 #include <QtCore/qcompilerdetection.h>
18 #include <QtGui/qaccessibleobject.h>
19+#include <QColor>
20+
21
22 namespace QtWebEngineCore {
23 class WebContentsAdapter;
diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
deleted file mode 100644
index 27bd141d..00000000
--- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From 4105c12d6f91171934f60b4dbb74b1ca7a9a3eb2 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH] Include dependency to QCoreApplication::translate()
5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7---
8 src/core/media_capture_devices_dispatcher.h | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
12index b13a9da..8a54cce 100644
13--- a/src/core/media_capture_devices_dispatcher.h
14+++ b/src/core/media_capture_devices_dispatcher.h
15@@ -46,6 +46,8 @@
16 #include <map>
17 #include <QtCore/qcompilerdetection.h>
18
19+#include <QCoreApplication>
20+
21 #include "web_contents_adapter_client.h"
22
23 #include "base/callback.h"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index deb336f8..e4802ec3 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS += " \ 15DEPENDS += " \
16 ninja-native \ 16 ninja-native \
17 yasm-native \
17 qtwebchannel \ 18 qtwebchannel \
18 qtbase qtdeclarative qtxmlpatterns qtquickcontrols \ 19 qtbase qtdeclarative qtxmlpatterns qtquickcontrols \
19 qtlocation \ 20 qtlocation \
@@ -23,8 +24,8 @@ DEPENDS += " \
23 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
24" 25"
25 26
26DEPENDS += "yasm-native"
27EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm GYP_CONFIG+=generate_character_data=0" 27EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm GYP_CONFIG+=generate_character_data=0"
28EXTRA_QMAKEVARS_CONFIGURE += "-feature-system-ninja -no-feature-system-gn"
28 29
29# To use system ffmpeg you need to enable also libwebp, opus, vpx 30# To use system ffmpeg you need to enable also libwebp, opus, vpx
30# Only depenedencies available in oe-core are enabled by default 31# Only depenedencies available in oe-core are enabled by default
@@ -61,37 +62,35 @@ def gettext_oeconf(d):
61require qt5.inc 62require qt5.inc
62require qt5-git.inc 63require qt5-git.inc
63 64
64export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja"
65
66do_configure() { 65do_configure() {
67 # replace LD with CXX, to workaround a possible gyp inheritssue?
68 export LD="${CXX}"
69 export CC="${CC}"
70 export CXX="${CXX}"
71 export CC_host="gcc"
72 export CXX_host="g++"
73 export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}"
74 export QMAKE_CACHE_EVAL="${PACKAGECONFIG_CONFARGS}"
75
76 # Disable autodetection from sysroot: 66 # Disable autodetection from sysroot:
77 sed -i 's/packagesExist([^)]*vpx[^)]*):/false:/g; s/config_libvpx:/false:/g; s/config_srtp:/false:/g; s/config_snappy:/false:/g; s/packagesExist(nss):/false:/g; s/packagesExist(minizip, zlib):/false:/g; s/packagesExist(libwebp,libwebpdemux):/false:/g; s/packagesExist(libxml-2.0,libxslt):/false:/g; s/^ *packagesExist($$package):/false:/g' ${S}/tools/qmake/mkspecs/features/configure.prf 67 sed -e 's/packagesExist([^)]*vpx[^)]*):/false:/g'\
68 -e 's/config_libvpx:/false:/g' \
69 -e 's/config_srtp:/false:/g' \
70 -e 's/config_snappy:/false:/g' \
71 -e 's/packagesExist(nss):/false:/g' \
72 -e 's/packagesExist(minizip, zlib):/false:/g' \
73 -e 's/packagesExist(libwebp,libwebpdemux):/false:/g' \
74 -e 's/packagesExist(libxml-2.0,libxslt):/false:/g'\
75 -e 's/^ *packagesExist($$package):/false:/g' \
76 -i ${S}/tools/qmake/mkspecs/features/configure.prf
78 77
79 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as 78 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as
80 # arguments here 79 # arguments here
81 ${OE_QMAKE_QMAKE} -r ${EXTRA_QMAKEVARS_PRE} ${S} \ 80 ${OE_QMAKE_QMAKE} ${EXTRA_QMAKEVARS_PRE} ${S} \
82 QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \ 81 QMAKE_CXX="${OE_QMAKE_CXX}" \
82 QMAKE_CC="${OE_QMAKE_CC}" \
83 QMAKE_LINK="${OE_QMAKE_LINK}" \ 83 QMAKE_LINK="${OE_QMAKE_LINK}" \
84 QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ 84 QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \
85 QMAKE_CXXFLAGS="${OE_QMAKE_CXXFLAGS}" \ 85 QMAKE_CXXFLAGS="${OE_QMAKE_CXXFLAGS}" \
86 QMAKE_AR="${OE_QMAKE_AR} cqs" \ 86 -after ${EXTRA_QMAKEVARS_POST} -- \
87 -after ${EXTRA_QMAKEVARS_POST} 87 ${EXTRA_QMAKEVARS_CONFIGURE}
88} 88}
89 89
90do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" 90do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
91 91
92do_install_append() { 92do_install_append() {
93 rmdir ${D}${OE_QMAKE_PATH_PLUGINS}/${BPN} ${D}${OE_QMAKE_PATH_PLUGINS} || true 93 sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@[^ ]*${B}[^ ]* @@g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc
94 sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@-L${B}[^ ]* @ @g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc
95} 94}
96PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" 95PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
97 96
@@ -104,24 +103,22 @@ RDEPENDS_${PN}-examples += " \
104 qtdeclarative-qmlplugins \ 103 qtdeclarative-qmlplugins \
105" 104"
106 105
107QT_MODULE_BRANCH_CHROMIUM = "53-based" 106QT_MODULE_BRANCH_CHROMIUM = "56-based"
108 107
109SRC_URI += " \ 108SRC_URI += " \
110 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 109 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
111 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ 110 file://0001-Force-host-toolchain-configuration.patch \
112 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
113 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
114 file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
115 file://0005-Include-dependency-to-QCoreApplication-translate.patch \
116 file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
117 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 111 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
118" 112"
119 113
120SRCREV_qtwebengine = "d740d6a7dbfec387752c7bc8a8b06db0e757c9dc" 114SRCREV_qtwebengine = "fa94cb09e095a6d6c5634ae8543fc70145594c05"
121SRCREV_chromium = "15d257fd921f37b32ef643225f21df0ea24c8302" 115SRCREV_chromium = "853d4069e45b06106f33611c458f5480f71e7c57"
122SRCREV = "${SRCREV_qtwebengine}" 116SRCREV = "${SRCREV_qtwebengine}"
123 117
124SRCREV_FORMAT = "qtwebengine_chromium" 118SRCREV_FORMAT = "qtwebengine_chromium"
125 119
126# WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel] 120# WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel]
127INSANE_SKIP_${PN} += "textrel" 121INSANE_SKIP_${PN} += "textrel"
122
123# Ninja may fail when path is too long, try to make it a bit shorter
124WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${QT_MODULE_BRANCH}"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 84b4d0ba..286aecae 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" 18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
19 19
20SRCREV = "f0898f83abdcacc8bd3bca3479884376b0963398" 20SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22"
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
deleted file mode 100644
index d7627ec2..00000000
--- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1From f6989fec34f0bafdeda549d71751f236ef1f3b96 Mon Sep 17 00:00:00 2001
2From: Magnus Granberg <zorry@gentoo.org>
3Date: Fri, 27 Feb 2015 11:55:09 +0100
4Subject: [PATCH] Remove TEXTREL tag in x86
5
6Fix textrel QA warnings when building qtwebkit for x86:
7
8 WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel]
9
10Patch from upstream webkit:
11
12 https://bugs.webkit.org/show_bug.cgi?id=70610
13
14Minor refresh required to apply cleanly to the older webkit sources used
15by qtwebkit. Specifically, the patch needed to be modified to account
16for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not
17part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ).
18
19Upstream status [webkit] : backport
20Upstream status [qtwebkit] : unclear
21
22Bug: https://bugs.webkit.org/show_bug.cgi?id=70610
23Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
24---
25 Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++
26 Source/WTF/wtf/InlineASM.h | 2 ++
27 2 files changed, 26 insertions(+)
28
29diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
30index 9684df2..8af82d8 100644
31--- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp
32+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
33@@ -524,6 +524,30 @@ double jsRound(double d)
34 } \
35 static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
36
37+#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__)
38+#define defineUnaryDoubleOpWrapper(function) \
39+ asm( \
40+ ".text\n" \
41+ ".globl " SYMBOL_STRING(function##Thunk) "\n" \
42+ HIDE_SYMBOL(function##Thunk) "\n" \
43+ SYMBOL_STRING(function##Thunk) ":" "\n" \
44+ "pushl %ebx\n" \
45+ "subl $20, %esp\n" \
46+ "movsd %xmm0, (%esp) \n" \
47+ "call __x86.get_pc_thunk.bx\n" \
48+ "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \
49+ "call " GLOBAL_REFERENCE(function) "\n" \
50+ "fstpl (%esp) \n" \
51+ "movsd (%esp), %xmm0 \n" \
52+ "addl $20, %esp\n" \
53+ "popl %ebx\n" \
54+ "ret\n" \
55+ );\
56+ extern "C" { \
57+ MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \
58+ } \
59+ static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
60+
61 #elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX))
62 #define defineUnaryDoubleOpWrapper(function) \
63 asm( \
64diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h
65index 0a2fe78..2dc40ef 100644
66--- a/Source/WTF/wtf/InlineASM.h
67+++ b/Source/WTF/wtf/InlineASM.h
68@@ -46,6 +46,8 @@
69 #define GLOBAL_REFERENCE(name) #name "@plt"
70 #elif CPU(X86) && COMPILER(MINGW)
71 #define GLOBAL_REFERENCE(name) "@" #name "@4"
72+#elif OS(LINUX) && CPU(X86) && defined(__PIC__)
73+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt"
74 #else
75 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
76 #endif
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 4845d0fd..8de7d117 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -20,7 +20,6 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
20 20
21SRC_URI += "\ 21SRC_URI += "\
22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ 22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
23 file://0002-Remove-TEXTREL-tag-in-x86.patch \
24 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ 23 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \
25" 24"
26 25
@@ -86,4 +85,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
86RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 85RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
87export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 86export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
88 87
89SRCREV = "74ac5b0f3489f9a08d083b6c9607c9d5c2d4afd2" 88SRCREV = "ce29c5f019ffe0ceec6eb9be3d82e1c061d0d530"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 043b394e..42c0e4a1 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 = "afb3c58d035db1119666c8556c215187be4f64b8" 14SRCREV = "91582c53c5c3b404169ce2a44d75ac8102043513"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 81c72ec8..3682aca2 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "54cc3158acfc75d12338df3b678e013909e66f60" 16SRCREV = "8c44529ed5269bc2130c27ba9733d262143424ed"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index c7efaf3f..7f51e06d 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \
16 16
17DEPENDS += "qtbase" 17DEPENDS += "qtbase"
18 18
19SRCREV = "9f7e01b582b1bd83cc6b8a854c510871335e2e74" 19SRCREV = "3a44e86cdceba7acc6b830274968b0dfa482f5a8"
20 20
21BBCLASSEXTEND =+ "native nativesdk" 21BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-08-18 17:21:16 +0000