summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-07-27 17:25:07 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-08-05 11:03:12 +0200
commit1a42aa78af040d0fbecc960e4f9dd3f180ccb404 (patch)
tree8f824b3548f0af18b91ed4737b72bdf8a2bed7e1
parent85694b94aa0b1e536eda13e7239720bca114b000 (diff)
downloadmeta-qt5-1a42aa78af040d0fbecc960e4f9dd3f180ccb404.tar.gz
qt5: upgrade to latest revisions in 5.7 branch
* LIC_FILES_CHKSUM were changed because of this small change: commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6 Author: Sze Howe Koh <szehowe.koh@gmail.com> Date: Tue Jun 14 19:12:35 2016 +0800 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" * -no-nis option was removed from qtbase in: commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db Author: Ralf Nolden <nolden@kde.org> Date: Fri May 20 22:03:39 2016 +0200 Cleanup NIS support leftover from Qt 3/4 * allow to disable eglfs independently from gles2, because eglfs-egldevice may be autodetected when libdrm was built before qtbase since this upstream commit: commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0 Author: Ralf Nolden <nolden@kde.org> Date: Tue May 17 12:38:44 2016 +0200 Make eglfs-egldevice check work with pkgconfig as well and then it fails to build, because libdrm could be removed from sysroot and drm.h is missing. * recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch was resolved in upstream commit: commit 26229cfa0b729313893af5674d604e8692dbb946 Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Date: Tue Apr 26 15:08:34 2016 +0200 QDeclarativeTextInput: update API to use setBlinkingCursorEnabled Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat
-rw-r--r--classes/qmake5_base.bbclass9
-rw-r--r--licenses/The-Qt-Company-Commercial20
-rw-r--r--recipes-qt/libconnman-qt/libconnman-qt5_git.bb6
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb23
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb4
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb22
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch24
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch16
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch12
-rw-r--r--recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch (renamed from recipes-qt/qt5/qtbase/0011-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch)11
-rw-r--r--recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch (renamed from recipes-qt/qt5/qtbase/0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0011-Always-build-uic.patch (renamed from recipes-qt/qt5/qtbase/0009-Always-build-uic.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch (renamed from recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch)14
-rw-r--r--recipes-qt/qt5/qtbase_git.bb24
-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.bb15
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch4
-rw-r--r--recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb15
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb17
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb12
-rw-r--r--recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb10
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb17
-rw-r--r--recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch31
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb16
-rw-r--r--recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch10
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb10
-rw-r--r--recipes-qt/qt5/qtscript_git.bb12
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb6
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb9
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb5
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb2
-rw-r--r--recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch2
-rw-r--r--recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch2
-rw-r--r--recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch2
-rw-r--r--recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch2
-rw-r--r--recipes-qt/qt5/qttools_git.bb14
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb10
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb15
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch2
-rw-r--r--recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch6
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb15
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb18
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb10
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb6
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-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.bb15
71 files changed, 314 insertions, 269 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index c2a84985..a4b7d1bf 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -161,6 +161,9 @@ qmake5_base_do_configure () {
161qmake5_base_native_do_install() { 161qmake5_base_native_do_install() {
162 oe_runmake install INSTALL_ROOT=${D} 162 oe_runmake install INSTALL_ROOT=${D}
163 find "${D}" -ignore_readdir_race -name "*.la" -delete 163 find "${D}" -ignore_readdir_race -name "*.la" -delete
164 if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then
165 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc
166 fi
164} 167}
165 168
166qmake5_base_nativesdk_do_install() { 169qmake5_base_nativesdk_do_install() {
@@ -168,6 +171,9 @@ qmake5_base_nativesdk_do_install() {
168 find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g" 171 find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g"
169 172
170 oe_runmake install INSTALL_ROOT=${D} 173 oe_runmake install INSTALL_ROOT=${D}
174 if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then
175 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc
176 fi
171} 177}
172 178
173qmake5_base_do_install() { 179qmake5_base_do_install() {
@@ -191,4 +197,7 @@ qmake5_base_do_install() {
191 TMP=`dirname ${TMP}`; 197 TMP=`dirname ${TMP}`;
192 done 198 done
193 fi 199 fi
200 if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then
201 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc
202 fi
194} 203}
diff --git a/licenses/The-Qt-Company-Commercial b/licenses/The-Qt-Company-Commercial
new file mode 100644
index 00000000..1c8cb00e
--- /dev/null
+++ b/licenses/The-Qt-Company-Commercial
@@ -0,0 +1,20 @@
1/******************************************************************************
2**
3** Copyright (C) 2015 The Qt Company Ltd.
4** Contact: http://www.qt.io/licensing/
5**
6** This file is part of the <Fill> module.
7**
8** $QT_BEGIN_LICENSE:COMM$
9**
10** Commercial License Usage
11** Licensees holding valid commercial Qt licenses may use this file in
12** accordance with the commercial license agreement provided with the
13** Software or, alternatively, in accordance with the terms contained in
14** a written agreement between you and The Qt Company. For licensing terms
15** and conditions see http://www.qt.io/terms-conditions. For further
16** information use the contact form at http://www.qt.io/contact-us.
17**
18** $QT_END_LICENSE$
19**
20******************************************************************************/
diff --git a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
index c9a81404..fe86eb56 100644
--- a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
+++ b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
@@ -15,3 +15,9 @@ S = "${WORKDIR}/git"
15inherit pkgconfig 15inherit pkgconfig
16 16
17RDEPENDS_${PN} += "connman" 17RDEPENDS_${PN} += "connman"
18
19do_install_append() {
20 if ls ${D}${libdir}/pkgconfig/connman-qt5.pc >/dev/null 2>/dev/null; then
21 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/connman-qt5.pc
22 fi
23}
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index b66c8a5e..74526484 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -3,16 +3,19 @@ DEPENDS = "nativesdk-zlib qtbase-native"
3SECTION = "libs" 3SECTION = "libs"
4HOMEPAGE = "http://qt-project.org" 4HOMEPAGE = "http://qt-project.org"
5 5
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 6LICENSE = "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 )"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ 8 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
9 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ 9 file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \
11 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
13 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
14 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 15 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 16 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13" 17"
14 18
15
16QT_MODULE = "qtbase" 19QT_MODULE = "qtbase"
17 20
18require nativesdk-qt5.inc 21require nativesdk-qt5.inc
@@ -30,12 +33,15 @@ SRC_URI += "\
30 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 33 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
31 file://0006-QOpenGLPaintDevice-sub-area-support.patch \ 34 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
32 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ 35 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
36 file://0008-configure-paths-for-target-qmake-properly.patch \
37 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \
38 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
33" 39"
34 40
35# common for qtbase-native and nativesdk-qtbase 41# common for qtbase-native and nativesdk-qtbase
36SRC_URI += " \ 42SRC_URI += " \
37 file://0009-Always-build-uic.patch \ 43 file://0011-Always-build-uic.patch \
38 file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ 44 file://0012-Add-external-hostbindir-option-for-native-sdk.patch \
39" 45"
40 46
41# CMake's toolchain configuration of nativesdk-qtbase 47# CMake's toolchain configuration of nativesdk-qtbase
@@ -162,7 +168,6 @@ do_configure() {
162 -no-gif \ 168 -no-gif \
163 -no-accessibility \ 169 -no-accessibility \
164 -no-cups \ 170 -no-cups \
165 -no-nis \
166 -no-gui \ 171 -no-gui \
167 -no-qml-debug \ 172 -no-qml-debug \
168 -no-sql-mysql \ 173 -no-sql-mysql \
@@ -257,4 +262,4 @@ fakeroot do_generate_qt_environment_file() {
257 262
258addtask generate_qt_environment_file after do_install before do_package 263addtask generate_qt_environment_file after do_install before do_package
259 264
260SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" 265SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd"
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index 8d69ca36..bb337fde 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,4 +1,4 @@
1From 16a6bfc8f93f8d4e0d4a6e09cdfb0c4a8412e38f Mon Sep 17 00:00:00 2001 1From befe1fd63c485b8d10d1b9f1eca3368f3ee0042b Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index c3a5bc5a..9708ec92 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -13,7 +13,7 @@ DEPENDS_class-target += "qtdeclarative qt3d-native"
13 13
14SRC_URI += " \ 14SRC_URI += " \
15 file://0001-Allow-a-tools-only-build.patch \ 15 file://0001-Allow-a-tools-only-build.patch \
16 " 16"
17 17
18PACKAGECONFIG ??= "" 18PACKAGECONFIG ??= ""
19PACKAGECONFIG_class-native ??= "tools-only" 19PACKAGECONFIG_class-native ??= "tools-only"
@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \
27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \ 27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \
28" 28"
29 29
30SRCREV = "be29a39ede4355a5aa18e93c27a75a1c3f81bde4" 30SRCREV = "c3fdb888fbd94de0f6b7b1a6859cba8132ecc93d"
31 31
32BBCLASSEXTEND += "native nativesdk" 32BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index ad0abe88..e1e25ba7 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -12,4 +12,4 @@ SRC_URI = " \
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
15PV = "5.6.99+5.7.0-beta+git${SRCPV}" 15PV = "5.7.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 426e0aeb..4da56405 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -2,11 +2,16 @@ DESCRIPTION = "Native version of Qt/[X11|Mac|Embedded]"
2DEPENDS = "zlib-native dbus-native" 2DEPENDS = "zlib-native dbus-native"
3SECTION = "libs" 3SECTION = "libs"
4HOMEPAGE = "http://qt-project.org" 4HOMEPAGE = "http://qt-project.org"
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 5
6LICENSE = "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 )"
6LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ 8 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
8 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ 9 file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \
11 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
13 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
14 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 15 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 16 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 17"
@@ -24,12 +29,14 @@ SRC_URI += "\
24 file://0006-QOpenGLPaintDevice-sub-area-support.patch \ 29 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
25 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ 30 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
26 file://0008-configure-paths-for-target-qmake-properly.patch \ 31 file://0008-configure-paths-for-target-qmake-properly.patch \
32 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \
33 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
27" 34"
28 35
29# common for qtbase-native and nativesdk-qtbase 36# common for qtbase-native and nativesdk-qtbase
30SRC_URI += " \ 37SRC_URI += " \
31 file://0009-Always-build-uic.patch \ 38 file://0011-Always-build-uic.patch \
32 file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ 39 file://0012-Add-external-hostbindir-option-for-native-sdk.patch \
33" 40"
34 41
35CLEANBROKEN = "1" 42CLEANBROKEN = "1"
@@ -50,7 +57,6 @@ PACKAGECONFIG_CONFARGS = " \
50 -no-gif \ 57 -no-gif \
51 -no-accessibility \ 58 -no-accessibility \
52 -no-cups \ 59 -no-cups \
53 -no-nis \
54 -no-gui \ 60 -no-gui \
55 -no-qml-debug \ 61 -no-qml-debug \
56 -no-sql-mysql \ 62 -no-sql-mysql \
@@ -117,4 +123,4 @@ do_install() {
117 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 123 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
118} 124}
119 125
120SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" 126SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index af85fe9d..b28ca8b6 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From 79f881eaa0a4a980963ce4ea1bc4c5e26c640c9a Mon Sep 17 00:00:00 2001 1From d6c75f788e15fb552eacb08359698a1342a97f20 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH] Add linux-oe-g++ platform 4Subject: [PATCH] Add linux-oe-g++ platform
@@ -56,10 +56,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
56 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 56 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
57 57
58diff --git a/configure b/configure 58diff --git a/configure b/configure
59index b65c564..ffe6931 100755 59index 0ba0c31..052872e 100755
60--- a/configure 60--- a/configure
61+++ b/configure 61+++ b/configure
62@@ -339,6 +339,16 @@ getQMakeConf() 62@@ -333,6 +333,16 @@ getQMakeConf()
63 getSingleQMakeVariable "$1" "$specvals" 63 getSingleQMakeVariable "$1" "$specvals"
64 } 64 }
65 65
@@ -76,8 +76,8 @@ index b65c564..ffe6931 100755
76 getXQMakeConf() 76 getXQMakeConf()
77 { 77 {
78 if [ -z "$xspecvals" ]; then 78 if [ -z "$xspecvals" ]; then
79@@ -348,6 +358,16 @@ getXQMakeConf() 79@@ -357,6 +367,16 @@ testXConfig()
80 getSingleQMakeVariable "$1" "$xspecvals" 80 esac
81 } 81 }
82 82
83+# OE qmake.conf is reading some variables from shell env 83+# OE qmake.conf is reading some variables from shell env
@@ -93,7 +93,7 @@ index b65c564..ffe6931 100755
93 compilerSupportsFlag() 93 compilerSupportsFlag()
94 { 94 {
95 cat >conftest.cpp <<EOF 95 cat >conftest.cpp <<EOF
96@@ -569,24 +589,14 @@ fi 96@@ -578,24 +598,14 @@ fi
97 # initalize variables 97 # initalize variables
98 #------------------------------------------------------------------------------- 98 #-------------------------------------------------------------------------------
99 99
@@ -124,7 +124,7 @@ index b65c564..ffe6931 100755
124 fi'` 124 fi'`
125 eval "$cmd" 125 eval "$cmd"
126 done 126 done
127@@ -3428,7 +3438,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then 127@@ -3443,7 +3453,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
128 [ "$CFG_GTK" = "auto" ] && CFG_GTK=no 128 [ "$CFG_GTK" = "auto" ] && CFG_GTK=no
129 fi 129 fi
130 130
@@ -133,7 +133,7 @@ index b65c564..ffe6931 100755
133 133
134 TEST_COMPILER=$QMAKE_CONF_COMPILER 134 TEST_COMPILER=$QMAKE_CONF_COMPILER
135 135
136@@ -3479,7 +3489,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then 136@@ -3494,7 +3504,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then
137 fi 137 fi
138 fi 138 fi
139 139
@@ -142,7 +142,7 @@ index b65c564..ffe6931 100755
142 142
143 GCC_MACHINE_DUMP= 143 GCC_MACHINE_DUMP=
144 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac 144 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
145@@ -3878,6 +3888,14 @@ setBootstrapVariable() 145@@ -3893,6 +3903,14 @@ setBootstrapVariable()
146 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" 146 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
147 } 147 }
148 148
@@ -157,7 +157,7 @@ index b65c564..ffe6931 100755
157 # build qmake 157 # build qmake
158 if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 158 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
159 echo "Creating qmake..." 159 echo "Creating qmake..."
160@@ -3977,6 +3995,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 160@@ -3986,6 +4004,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
161 EXEEXT= 161 EXEEXT=
162 ;; 162 ;;
163 esac 163 esac
@@ -166,10 +166,10 @@ index b65c564..ffe6931 100755
166 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" 166 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile"
167 echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" 167 echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
168diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 168diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
169index 92c288c..f3019e0 100644 169index a890c7f..151630c 100644
170--- a/mkspecs/features/configure.prf 170--- a/mkspecs/features/configure.prf
171+++ b/mkspecs/features/configure.prf 171+++ b/mkspecs/features/configure.prf
172@@ -63,14 +63,14 @@ defineTest(qtCompileTest) { 172@@ -71,14 +71,14 @@ defineTest(qtCompileTest) {
173 } 173 }
174 174
175 # Clean up after previous run 175 # Clean up after previous run
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 54895dfb..699e3856 100644
--- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,4 +1,4 @@
1From aaa1675d3c9f0d100f596ca4e2ddf3bd25fae5b6 Mon Sep 17 00:00:00 2001 1From e5f8607cfa1d2bcc798686cdf7c87ea0c6577d30 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the 4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
index 11cd97b0..381cde29 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,4 +1,4 @@
1From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f Mon Sep 17 00:00:00 2001 1From c1dc6165d6a085f162ed32ef5697f645019f9ee0 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] Add -external-hostbindir option
@@ -39,10 +39,10 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2
39 7 files changed, 44 insertions(+), 8 deletions(-) 39 7 files changed, 44 insertions(+), 8 deletions(-)
40 40
41diff --git a/configure b/configure 41diff --git a/configure b/configure
42index ffe6931..5aa87b4 100755 42index 052872e..1fcbb3a 100755
43--- a/configure 43--- a/configure
44+++ b/configure 44+++ b/configure
45@@ -825,6 +825,7 @@ QT_HOST_BINS= 45@@ -834,6 +834,7 @@ QT_HOST_BINS=
46 QT_HOST_LIBS= 46 QT_HOST_LIBS=
47 QT_HOST_DATA= 47 QT_HOST_DATA=
48 QT_EXT_PREFIX= 48 QT_EXT_PREFIX=
@@ -50,7 +50,7 @@ index ffe6931..5aa87b4 100755
50 50
51 #flags for SQL drivers 51 #flags for SQL drivers
52 QT_CFLAGS_PSQL= 52 QT_CFLAGS_PSQL=
53@@ -944,6 +945,7 @@ while [ "$#" -gt 0 ]; do 53@@ -953,6 +954,7 @@ while [ "$#" -gt 0 ]; do
54 -testsdir| \ 54 -testsdir| \
55 -hostdatadir| \ 55 -hostdatadir| \
56 -hostbindir| \ 56 -hostbindir| \
@@ -58,7 +58,7 @@ index ffe6931..5aa87b4 100755
58 -hostlibdir| \ 58 -hostlibdir| \
59 -extprefix| \ 59 -extprefix| \
60 -sysroot| \ 60 -sysroot| \
61@@ -1176,6 +1178,9 @@ while [ "$#" -gt 0 ]; do 61@@ -1185,6 +1187,9 @@ while [ "$#" -gt 0 ]; do
62 extprefix) 62 extprefix)
63 QT_EXT_PREFIX="$VAL" 63 QT_EXT_PREFIX="$VAL"
64 ;; 64 ;;
@@ -68,7 +68,7 @@ index ffe6931..5aa87b4 100755
68 pkg-config) 68 pkg-config)
69 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 69 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
70 CFG_PKGCONFIG="$VAL" 70 CFG_PKGCONFIG="$VAL"
71@@ -2438,6 +2443,10 @@ Installation options: 71@@ -2447,6 +2452,10 @@ Installation options:
72 -hostdatadir <dir> . Data used by qmake will be installed to <dir> 72 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
73 (default HOSTPREFIX) 73 (default HOSTPREFIX)
74 74
@@ -79,7 +79,7 @@ index ffe6931..5aa87b4 100755
79 Configure options: 79 Configure options:
80 80
81 The defaults (*) are usually acceptable. A plus (+) denotes a default value 81 The defaults (*) are usually acceptable. A plus (+) denotes a default value
82@@ -3196,6 +3205,11 @@ fi 82@@ -3209,6 +3218,11 @@ fi
83 # command line and environment validation 83 # command line and environment validation
84 #------------------------------------------------------------------------------- 84 #-------------------------------------------------------------------------------
85 85
@@ -92,7 +92,7 @@ index ffe6931..5aa87b4 100755
92 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h 92 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
93 case "$CFG_QCONFIG" in 93 case "$CFG_QCONFIG" in
94diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 94diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
95index cfac583..41ca7f1 100644 95index 54641ce..7d7baa4 100644
96--- a/mkspecs/features/qt_functions.prf 96--- a/mkspecs/features/qt_functions.prf
97+++ b/mkspecs/features/qt_functions.prf 97+++ b/mkspecs/features/qt_functions.prf
98@@ -71,7 +71,11 @@ defineTest(qtHaveModule) { 98@@ -71,7 +71,11 @@ defineTest(qtHaveModule) {
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
index b3677eb0..e24d4758 100644
--- 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
@@ -1,4 +1,4 @@
1From ac2f94a42878c1500e1ab6bbbec7834d9e5edfbb Mon Sep 17 00:00:00 2001 1From d83234c35de8f52ce3bf6eb262ad8e6af467ac34 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200 3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements 4Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
@@ -68,7 +68,7 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
68 2 files changed, 14 insertions(+), 1 deletion(-) 68 2 files changed, 14 insertions(+), 1 deletion(-)
69 69
70diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf 70diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
71index 03ec36a..2ab192b 100644 71index 71e96b4..0d7535c 100644
72--- a/mkspecs/features/qt.prf 72--- a/mkspecs/features/qt.prf
73+++ b/mkspecs/features/qt.prf 73+++ b/mkspecs/features/qt.prf
74@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { 74@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) {
@@ -92,7 +92,7 @@ index 03ec36a..2ab192b 100644
92 contains(QT_CONFIG, static) { 92 contains(QT_CONFIG, static) {
93 QT_PLUGIN_VERIFY += QTPLUGIN 93 QT_PLUGIN_VERIFY += QTPLUGIN
94diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 94diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
95index c1c668a..67d916d 100644 95index b367bc1..209cc43 100644
96--- a/mkspecs/features/qt_common.prf 96--- a/mkspecs/features/qt_common.prf
97+++ b/mkspecs/features/qt_common.prf 97+++ b/mkspecs/features/qt_common.prf
98@@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { 98@@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) {
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 404c0686..d455d2cd 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 d108da324156b9d709c106c1698bd7466cb26f69 Mon Sep 17 00:00:00 2001 1From 60f490b57faf979a912074506a75c74767a27d3b 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
@@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
14 1 file changed, 3 insertions(+), 3 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index 5aa87b4..17bca95 100755 17index 1fcbb3a..f49a674 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3832,10 +3832,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ 20@@ -3847,10 +3847,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
21 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; 21 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
22 22
23 /* Installation Info */ 23 /* Installation Info */
diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
index 92ecb133..c58b1d9a 100644
--- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,4 +1,4 @@
1From 17450df40d6c163c85b66c1cc485317fd6f9a9c9 Mon Sep 17 00:00:00 2001 1From f207997b59f1381cf3523521209cb435b1a73f25 Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com> 2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Thu, 16 May 2013 09:52:07 +0300 3Date: Thu, 16 May 2013 09:52:07 +0300
4Subject: [PATCH] QOpenGLPaintDevice sub-area support 4Subject: [PATCH] QOpenGLPaintDevice sub-area support
@@ -140,10 +140,10 @@ index c9f3282..7c0616b 100644
140 QOpenGLContext *ctx; 140 QOpenGLContext *ctx;
141 EngineMode mode; 141 EngineMode mode;
142diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp 142diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
143index 8f69095..cf82ee7 100644 143index 9a7b1eb..6f301f8 100644
144--- a/src/gui/opengl/qopengltextureglyphcache.cpp 144--- a/src/gui/opengl/qopengltextureglyphcache.cpp
145+++ b/src/gui/opengl/qopengltextureglyphcache.cpp 145+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
146@@ -316,7 +316,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) 146@@ -403,7 +403,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
147 funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); 147 funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
148 148
149 if (pex != 0) { 149 if (pex != 0) {
diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
index 4cc8ce6d..4ea4061a 100644
--- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
+++ b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
@@ -1,4 +1,4 @@
1From edb00662de57d0b6ddb39f80800cf3d20c6c07fd Mon Sep 17 00:00:00 2001 1From 7ab6ff7ba20a3173c10a76814d3c9ed312c80627 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 8 Jun 2015 13:59:25 -0700 3Date: Mon, 8 Jun 2015 13:59:25 -0700
4Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T 4Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T
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
index 106486f3..bac18412 100644
--- 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
@@ -1,4 +1,4 @@
1From e1bc7a14ae9e433112006b1b6944f8b0e3f619ab Mon Sep 17 00:00:00 2001 1From 0f4ab3e27938002134e8f3f9eb12cf9c50b2ab95 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 13 Nov 2015 12:36:11 +0100 3Date: Fri, 13 Nov 2015 12:36:11 +0100
4Subject: [PATCH] configure paths for target qmake properly 4Subject: [PATCH] configure paths for target qmake properly
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 19 insertions(+), 4 deletions(-) 19 1 file changed, 19 insertions(+), 4 deletions(-)
20 20
21diff --git a/configure b/configure 21diff --git a/configure b/configure
22index 17bca95..6abdd6b 100755 22index f49a674..d30d0ca 100755
23--- a/configure 23--- a/configure
24+++ b/configure 24+++ b/configure
25@@ -3777,8 +3777,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then 25@@ -3792,8 +3792,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
26 QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" 26 QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
27 fi 27 fi
28 28
@@ -38,7 +38,7 @@ index 17bca95..6abdd6b 100755
38 38
39 QT_CONFIGURE_STR_OFF=0 39 QT_CONFIGURE_STR_OFF=0
40 40
41@@ -3811,7 +3816,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS 41@@ -3826,7 +3831,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
42 42
43 QT_CONFIGURE_STR_OFFSETS= 43 QT_CONFIGURE_STR_OFFSETS=
44 QT_CONFIGURE_STRS= 44 QT_CONFIGURE_STRS=
@@ -51,7 +51,7 @@ index 17bca95..6abdd6b 100755
51 addConfStr "$QT_REL_HOST_BINS" 51 addConfStr "$QT_REL_HOST_BINS"
52 addConfStr "$QT_REL_HOST_LIBS" 52 addConfStr "$QT_REL_HOST_LIBS"
53 addConfStr "$QT_REL_HOST_DATA" 53 addConfStr "$QT_REL_HOST_DATA"
54@@ -3823,6 +3832,12 @@ addConfStr "$shortspec" 54@@ -3838,6 +3847,12 @@ addConfStr "$shortspec"
55 #------------------------------------------------------------------------------- 55 #-------------------------------------------------------------------------------
56 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" 56 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
57 57
@@ -64,7 +64,7 @@ index 17bca95..6abdd6b 100755
64 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF 64 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
65 /* License Info */ 65 /* License Info */
66 static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; 66 static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee";
67@@ -3835,7 +3850,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 67@@ -3850,7 +3865,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"; 68 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
69 #ifdef QT_BUILD_QMAKE 69 #ifdef QT_BUILD_QMAKE
70 static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; 70 static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
diff --git a/recipes-qt/qt5/qtbase/0011-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch b/recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch
index 3c0b9e61..23d0ab38 100644
--- a/recipes-qt/qt5/qtbase/0011-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch
+++ b/recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch
@@ -1,4 +1,4 @@
1From d623d2c2ed49c4dc57fb0dde1faab20976dfc3dc Mon Sep 17 00:00:00 2001 1From 91b87aed0a2a96b0d6b54757ea13c75ee648a9b0 Mon Sep 17 00:00:00 2001
2From: Julien Gueytat <contact@jgueytat.fr> 2From: Julien Gueytat <contact@jgueytat.fr>
3Date: Wed, 27 Apr 2016 19:24:39 +0200 3Date: Wed, 27 Apr 2016 19:24:39 +0200
4Subject: [PATCH] Reorder EGL libraries from pkgconfig and defaults: 4Subject: [PATCH] Reorder EGL libraries from pkgconfig and defaults:
@@ -59,10 +59,10 @@ index d8b1c3e..06f7241 100644
59+ 59+
60+CONFIG -= qt 60+CONFIG -= qt
61diff --git a/configure b/configure 61diff --git a/configure b/configure
62index 2e99d39..072838b 100755 62index d30d0ca..14f348c 100755
63--- a/configure 63--- a/configure
64+++ b/configure 64+++ b/configure
65@@ -5803,7 +5803,9 @@ if [ "$CFG_EGL" != "no" ]; then 65@@ -5891,7 +5891,9 @@ if [ "$CFG_EGL" != "no" ]; then
66 QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL" 66 QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
67 QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL" 67 QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
68 QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`" 68 QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`"
@@ -73,7 +73,7 @@ index 2e99d39..072838b 100755
73 if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then 73 if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
74 CFG_EGL=yes 74 CFG_EGL=yes
75 if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then 75 if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
76@@ -5826,8 +5828,18 @@ fi 76@@ -5914,8 +5916,18 @@ fi
77 if [ "$CFG_EGLFS" != "no" ]; then 77 if [ "$CFG_EGLFS" != "no" ]; then
78 if [ "$XPLATFORM_QNX" = "no" ] && [ "$CFG_OPENGL" != "no" ]; then 78 if [ "$XPLATFORM_QNX" = "no" ] && [ "$CFG_OPENGL" != "no" ]; then
79 CFG_EGLFS="$CFG_EGL" 79 CFG_EGLFS="$CFG_EGL"
@@ -93,6 +93,3 @@ index 2e99d39..072838b 100755
93 CFG_EGLFS_BRCM=yes 93 CFG_EGLFS_BRCM=yes
94 else 94 else
95 CFG_EGLFS_BRCM=no 95 CFG_EGLFS_BRCM=no
96--
971.9.1
98
diff --git a/recipes-qt/qt5/qtbase/0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
index 7a24459c..1d0ea3e8 100644
--- a/recipes-qt/qt5/qtbase/0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
+++ b/recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
@@ -1,4 +1,4 @@
1From f5a949e17aa8b37491fbc414c38557c9920fa1e5 Mon Sep 17 00:00:00 2001 1From b397a71531e31383ee86135e21072d033480f5bc Mon Sep 17 00:00:00 2001
2From: Pascal Bach <pascal.bach@siemens.com> 2From: Pascal Bach <pascal.bach@siemens.com>
3Date: Wed, 11 May 2016 15:20:41 +0200 3Date: Wed, 11 May 2016 15:20:41 +0200
4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS 4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -24,7 +24,6 @@ Upstream-Status: Pending
24 - 0010-Add-external-hostbindir-option-for-native-sdk.patch 24 - 0010-Add-external-hostbindir-option-for-native-sdk.patch
25 25
26Signed-off-by: Pascal Bach <pascal.bach@siemens.com> 26Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
27
28--- 27---
29 mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++ 28 mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++
30 src/corelib/Qt5Config.cmake.in | 5 +++++ 29 src/corelib/Qt5Config.cmake.in | 5 +++++
@@ -62,6 +61,3 @@ index a872d0e..233d663 100644
62 if (NOT Qt5_FIND_COMPONENTS) 61 if (NOT Qt5_FIND_COMPONENTS)
63 set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\") 62 set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\")
64 set(Qt5_FOUND False) 63 set(Qt5_FOUND False)
65--
662.1.4
67
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
index bee10d55..fb3d316f 100644
--- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
@@ -1,4 +1,4 @@
1From 14b037afc3fa6992733891205a46b44991402afb Mon Sep 17 00:00:00 2001 1From 1b94b0f2579edcf870bc953f820af8fb2ec4376f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100 3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH] Always build uic 4Subject: [PATCH] Always build uic
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/src/src.pro b/src/src.pro 16diff --git a/src/src.pro b/src/src.pro
17index 4a165a2..0f84791 100644 17index 3d18540..d128b3a 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -180,7 +180,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent 20@@ -195,7 +195,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 } 21 }
22 } 22 }
23 } 23 }
diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch
index 949b323f..1ab8abef 100644
--- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
+++ b/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch
@@ -1,4 +1,4 @@
1From 6df8d620081bd78319fc97846e52b1a83042401a Mon Sep 17 00:00:00 2001 1From cb66a3193b1b1b8b402548b615c3675c4adcf13a 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 for native(sdk) 4Subject: [PATCH] Add -external-hostbindir option for native(sdk)
@@ -37,10 +37,10 @@ Conflicts:
37 5 files changed, 16 insertions(+), 1 deletion(-) 37 5 files changed, 16 insertions(+), 1 deletion(-)
38 38
39diff --git a/configure b/configure 39diff --git a/configure b/configure
40index 6abdd6b..7c5a066 100755 40index 14f348c..61f22e8 100755
41--- a/configure 41--- a/configure
42+++ b/configure 42+++ b/configure
43@@ -3824,6 +3824,7 @@ fi 43@@ -3839,6 +3839,7 @@ fi
44 addConfStr "$QT_REL_HOST_BINS" 44 addConfStr "$QT_REL_HOST_BINS"
45 addConfStr "$QT_REL_HOST_LIBS" 45 addConfStr "$QT_REL_HOST_LIBS"
46 addConfStr "$QT_REL_HOST_DATA" 46 addConfStr "$QT_REL_HOST_DATA"
@@ -94,10 +94,10 @@ index 362d47d..a2326e2 100644
94 HostSpecPath, 94 HostSpecPath,
95 HostPrefixPath, 95 HostPrefixPath,
96diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 96diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
97index 7fd0b98..47fa6c3 100644 97index 0fa205b..2921e2b 100644
98--- a/tools/configure/configureapp.cpp 98--- a/tools/configure/configureapp.cpp
99+++ b/tools/configure/configureapp.cpp 99+++ b/tools/configure/configureapp.cpp
100@@ -1202,6 +1202,13 @@ void Configure::parseCmdLine() 100@@ -1219,6 +1219,13 @@ void Configure::parseCmdLine()
101 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); 101 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
102 } 102 }
103 103
@@ -111,7 +111,7 @@ index 7fd0b98..47fa6c3 100644
111 else if (configCmdLine.at(i) == "-make-tool") { 111 else if (configCmdLine.at(i) == "-make-tool") {
112 ++i; 112 ++i;
113 if (i == argCount) 113 if (i == argCount)
114@@ -4121,6 +4128,9 @@ void Configure::generateQConfigCpp() 114@@ -4171,6 +4178,9 @@ void Configure::generateQConfigCpp()
115 115
116 if (dictionary["QT_REL_HOST_DATA"].isEmpty()) 116 if (dictionary["QT_REL_HOST_DATA"].isEmpty())
117 dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; 117 dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"];
@@ -121,7 +121,7 @@ index 7fd0b98..47fa6c3 100644
121 121
122 confStringOff = 0; 122 confStringOff = 0;
123 addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); 123 addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]);
124@@ -4140,6 +4150,7 @@ void Configure::generateQConfigCpp() 124@@ -4190,6 +4200,7 @@ void Configure::generateQConfigCpp()
125 addConfStr(1, dictionary["QT_REL_HOST_BINS"]); 125 addConfStr(1, dictionary["QT_REL_HOST_BINS"]);
126 addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); 126 addConfStr(1, dictionary["QT_REL_HOST_LIBS"]);
127 addConfStr(1, dictionary["QT_REL_HOST_DATA"]); 127 addConfStr(1, dictionary["QT_REL_HOST_DATA"]);
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index a2a865db..fcaa322d 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -1,11 +1,15 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 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 = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ 7 file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11" 15"
@@ -20,8 +24,8 @@ SRC_URI += "\
20 file://0006-QOpenGLPaintDevice-sub-area-support.patch \ 24 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
21 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ 25 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
22 file://0008-configure-paths-for-target-qmake-properly.patch \ 26 file://0008-configure-paths-for-target-qmake-properly.patch \
23 file://0011-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \ 27 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \
24 file://0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 28 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
25" 29"
26 30
27DEPENDS += "qtbase-native" 31DEPENDS += "qtbase-native"
@@ -82,8 +86,9 @@ PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg"
82PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" 86PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng"
83PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" 87PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib"
84PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre" 88PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre"
85PACKAGECONFIG[gl] = "-opengl desktop -no-eglfs,,virtual/libgl" 89PACKAGECONFIG[eglfs] = "-eglfs,-no-eglfs,virtual/drm"
86PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl" 90PACKAGECONFIG[gl] = "-opengl desktop,,virtual/libgl"
91PACKAGECONFIG[gles2] = "-opengl es2,,virtual/libgles2 virtual/egl"
87PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" 92PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib"
88PACKAGECONFIG[cups] = "-cups,-no-cups,cups" 93PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
89PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" 94PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
@@ -123,7 +128,6 @@ PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
123PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" 128PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
124PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" 129PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib"
125PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" 130PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio"
126PACKAGECONFIG[nis] = "-nis,-no-nis"
127PACKAGECONFIG[widgets] = "-widgets,-no-widgets" 131PACKAGECONFIG[widgets] = "-widgets,-no-widgets"
128PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" 132PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy"
129PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" 133PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput"
@@ -221,4 +225,4 @@ do_install_append() {
221 225
222RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 226RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
223 227
224SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" 228SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index a1c8f7fd..8cf316bf 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 = "32404e27101c5ec81b4ab965faf38263429bbc5a" 13SRCREV = "1568c60d2a0d1758acfeec9f002af7ff5b4d28ee"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 99d1471e..21f6f139 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 = "8a781841812a42ed728a76c0dcdcaa6196eac44e" 11SRCREV = "03a6177a3223f928a5f329c8b1fc4d5fe376deed"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index b84ad040..67f882ad 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,14 +1,17 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" 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 = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
12" 15"
13 16
14DEPENDS += "qtbase qtdeclarative" 17DEPENDS += "qtbase qtdeclarative"
@@ -25,4 +28,4 @@ do_configure_prepend() {
25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 28 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
26} 29}
27 30
28SRCREV = "f8759f683cfc433c432059e1160d2ab657baaec6" 31SRCREV = "8755a1f2460fa523782e27b6ca7a430a0176ac61"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index ccdd1b3e..50a0bcc6 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 = "2f6074fde0ec050c77f881e0d2ce265fa93a0fcc" 11SRCREV = "d6a8da66dc3c141621c9be4b7509a6e43c60e15c"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
index 1a8a5f0f..b71e3a4b 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
+++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
@@ -1,4 +1,4 @@
1From c978b2ed0e1ce48b2d4a4a6eb660927bc88aed57 Mon Sep 17 00:00:00 2001 1From 0d742f34ef91fb4e35c68b1274f68daef594f0c3 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200 3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH] qmltestexample: fix link 4Subject: [PATCH] qmltestexample: fix link
@@ -47,7 +47,7 @@ index c9d78e2..5861613 100644
47 SOURCES += tst_qjsengine.cpp 47 SOURCES += tst_qjsengine.cpp
48 RESOURCES += qjsengine.qrc 48 RESOURCES += qjsengine.qrc
49diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro 49diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
50index 54db7a7..8c6986c 100644 50index 52fd6bf..843cae6 100644
51--- a/tests/auto/qmltest/qmltest.pro 51--- a/tests/auto/qmltest/qmltest.pro
52+++ b/tests/auto/qmltest/qmltest.pro 52+++ b/tests/auto/qmltest/qmltest.pro
53@@ -4,6 +4,7 @@ CONFIG += qmltestcase 53@@ -4,6 +4,7 @@ CONFIG += qmltestcase
diff --git a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
index dc707abf..d0d0f8e0 100644
--- a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
+++ b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
@@ -1,4 +1,4 @@
1From 493e91c9c3527d577f7051de9a582a178ca43fcf Mon Sep 17 00:00:00 2001 1From 6b1cef42f828cd2374739aa7e3b3800d579315d6 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Thu, 31 Mar 2016 19:38:58 -0400 3Date: Thu, 31 Mar 2016 19:38:58 -0400
4Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been 4Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 5e966330..4a690cb9 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,12 +1,15 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 15"
@@ -34,6 +37,6 @@ do_configure_prepend() {
34 37
35EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 38EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
36 39
37SRCREV = "31ef2e858c2a0835c040b3199c9557f0f6c66808" 40SRCREV = "d48b397cc79265e80c8437888f9ded0b0364e418"
38 41
39BBCLASSEXTEND =+ "native nativesdk" 42BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index d5e8dfa4..e77d358c 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -1,14 +1,21 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 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 = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
10" 11"
11 12
12DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 13DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
13 14
14SRCREV = "0f6e294fb8534f677a5ec75113679cfe24f559c1" 15SRCREV = "cedca298f081e1c1cdac615eed6171fe687f35e2"
16
17do_install_append() {
18 if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then
19 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Enginio.pc
20 fi
21}
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 1ecc4f70..6c62a683 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,20 +1,22 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5# There are no GPLv2 licensed files in this component.
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
9 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 13 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
14" 16"
15 17
16DEPENDS += "qtdeclarative" 18DEPENDS += "qtdeclarative"
17 19
18RDEPENDS_${PN}-dev = "" 20RDEPENDS_${PN}-dev = ""
19 21
20SRCREV = "d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b" 22SRCREV = "d3023be0d839440ac046adf2af75d9e4306dd5ef"
diff --git a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
index 11a97260..03432c9e 100644
--- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
+++ b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
@@ -1,4 +1,4 @@
1From 6f01ba8602a4efdb31bf01bf58aa4cb23552e9ac Mon Sep 17 00:00:00 2001 1From 7eb3fddc70871048f170211a88194c8cdeeca4dd Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 4 Aug 2014 19:19:05 +0200 3Date: Mon, 4 Aug 2014 19:19:05 +0200
4Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic 4Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 6c983c24..7f8179e1 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,14 +1,18 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" 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 = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 13 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
12" 16"
13 17
14DEPENDS += "qtbase" 18DEPENDS += "qtbase"
@@ -28,4 +32,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+
28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" 33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
30 34
31SRCREV = "42b07b2ddf443d3eafd18e169f2e5ab5e36604a5" 35SRCREV = "d4401c9f519dfe82c38fe9ded674e454655f1866"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index ce240c52..7a9ecb47 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,4 +29,4 @@ do_configure_prepend() {
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31 31
32SRCREV = "e41c3a9b345536ccee0840ac6f049173aa6a0785" 32SRCREV = "4e1008b4ac1eea776585ca41a6a3db127cf500ff"
diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
index 81fcd392..fa6b5852 100644
--- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
+++ b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
@@ -1,4 +1,4 @@
1From df587e2a3bb2aa297088bd3ada4309c4b9a85195 Mon Sep 17 00:00:00 2001 1From 26fd6cf787a7a413d54205b8b42d16a63ed5d36a Mon Sep 17 00:00:00 2001
2From: Yoann Lopes <yoann.lopes@digia.com> 2From: Yoann Lopes <yoann.lopes@digia.com>
3Date: Thu, 31 Oct 2013 15:06:30 +0100 3Date: Thu, 31 Oct 2013 15:06:30 +0100
4Subject: [PATCH] Initial porting effort to GStreamer 1.0. 4Subject: [PATCH] Initial porting effort to GStreamer 1.0.
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 5c723376..3bbfb6e0 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,12 +1,15 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 15"
@@ -32,7 +35,7 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'G
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}" 35EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}"
33 36
34SRC_URI += "\ 37SRC_URI += "\
35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ 38 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
36" 39"
37 40
38SRCREV = "c85fd6df07935b9c0fa08f881271cd94ad100003" 41SRCREV = "1be4f74843b41f8bc1d1d64e83485f4eb864e8b4"
diff --git a/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch b/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch
deleted file mode 100644
index 27a2140c..00000000
--- a/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 450d5dee6cc4f35a7475af507b90ba67327ad724 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 26 Apr 2016 17:48:18 +0200
4Subject: [PATCH] qdeclarativetextinput: update to match QWidgetLineControl API
5 change
6
7* setCursorBlinkPeriod was replaced with setBlinkingCursorEnabled &
8 updateCursorBlinking in qtbase commit:
9 commit 1b5bc9723c0b23ca5197097c3087df6bbe024a2a
10 Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
11 Date: Tue Apr 19 10:15:54 2016 +0200
12 Subject: QWidgetLineControl: respect run-time changes to cursorFlashTime
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
20index 3ff75fd..e39d1af 100644
21--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
22+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
23@@ -514,7 +514,7 @@ void QDeclarativeTextInput::setCursorVisible(bool on)
24 if (d->cursorVisible == on)
25 return;
26 d->cursorVisible = on;
27- d->control->setCursorBlinkPeriod(on?QApplication::cursorFlashTime():0);
28+ d->control->setBlinkingCursorEnabled(on);
29 QRect r = d->control->cursorRect();
30 if (d->control->inputMask().isEmpty())
31 updateRect(r);
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 55179fa6..4107c3a3 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,23 +1,19 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5# There are no GPLv2 licensed files in this component.
6# Note that some files are LGPL-2.1 only without The-Qt-Company-Qt-LGPL-Exception-1.1.
7LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
8LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
9 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
10 file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
14" 12"
15 13
16DEPENDS += "qtscript qtsvg qtxmlpatterns" 14DEPENDS += "qtscript qtsvg qtxmlpatterns"
17# qttools 15# qttools
18 16
19SRC_URI += "file://0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch"
20
21PACKAGECONFIG ??= "webkit" 17PACKAGECONFIG ??= "webkit"
22PACKAGECONFIG[webkit] = ",,qtwebkit" 18PACKAGECONFIG[webkit] = ",,qtwebkit"
23 19
@@ -27,4 +23,4 @@ do_configure_prepend() {
27 sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro 23 sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro
28} 24}
29 25
30SRCREV = "5e3bd5cb28e7af95b289a617ca2f7a8892498225" 26SRCREV = "857fc5ec4644a6111ba8725e4e1a84dd5ea6bfca"
diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
index ad2b489d..85fcc158 100644
--- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
+++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
@@ -1,4 +1,4 @@
1From 00bb7694b9287f23d4d059ae134e9409db69673e Mon Sep 17 00:00:00 2001 1From fca6212d5ebc5851f28e820e4ff0ebe04a9d44d7 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Thu, 31 Mar 2016 19:57:01 -0400 3Date: Thu, 31 Mar 2016 19:57:01 -0400
4Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' 4Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug'
@@ -7,13 +7,13 @@ Upstream-Status: Pending
7 7
8Signed-off-by: Denys Dmytriyenko <denys@ti.com> 8Signed-off-by: Denys Dmytriyenko <denys@ti.com>
9--- 9---
10 examples/quick/controls/texteditor/src/documenthandler.cpp | 1 + 10 examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | 1 +
11 1 file changed, 1 insertion(+) 11 1 file changed, 1 insertion(+)
12 12
13diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp 13diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
14index bdecf5b..811a761 100644 14index bdecf5b..811a761 100644
15--- a/examples/quick/controls/texteditor/src/documenthandler.cpp 15--- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
16+++ b/examples/quick/controls/texteditor/src/documenthandler.cpp 16+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
17@@ -54,6 +54,7 @@ 17@@ -54,6 +54,7 @@
18 #include <QtGui/QTextCursor> 18 #include <QtGui/QTextCursor>
19 #include <QtGui/QFontDatabase> 19 #include <QtGui/QFontDatabase>
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 00fe4fc9..7271a19a 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" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "2a5c64a1ddf5b6fdb9104faf99260925a327b2f4" 13SRCREV = "cc0ee8e4f3345023f1b85fc815739c0a75ea5686"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 9231a79c..176035c0 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,12 +1,16 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-2.0" 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 = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
6 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
8 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
10 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
7 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 12 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
8 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
9 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
10" 14"
11 15
12DEPENDS += "qtdeclarative" 16DEPENDS += "qtdeclarative"
@@ -17,4 +21,4 @@ SRC_URI += " \
17 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 21 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
18" 22"
19 23
20SRCREV = "3411c3579fb9e767c819c0c8d9f35c52c9964b06" 24SRCREV = "37f8b753be1b16975220c8b611b17a428eafb9e9"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 7859ec53..bee833dd 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,13 +1,11 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5# Note that some files are LGPL-2.1 only without The-Qt-Company-Qt-LGPL-Exception-1.1.
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13" 11"
@@ -27,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
27 25
28DEPENDS += "qtbase" 26DEPENDS += "qtbase"
29 27
30SRCREV = "b49bfdaad11be1de632f907d43485a7ac701ddc5" 28SRCREV = "b8845794b95376e8be39dbdafca2c85b5ec4c195"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 1098f25e..af45d89a 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,9 +1,7 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5# There are no GPLv2 licensed files in this component.
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
9 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
@@ -15,4 +13,4 @@ LIC_FILES_CHKSUM = " \
15 13
16DEPENDS += "qtbase qtdeclarative" 14DEPENDS += "qtbase qtdeclarative"
17 15
18SRCREV = "33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8" 16SRCREV = "e03c37077ea4841b9e0b591d29a34737d7d8dd32"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 731bd481..397ac4e9 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -1,13 +1,14 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0)" 4LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+)"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 6 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
7 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 7 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
8 file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ 9 file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
9" 10"
10 11
11DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
12 13
13SRCREV = "f9201ca7bad9220149fb39b89914e83a4a14dffc" 14SRCREV = "88554d068d287870740b842864a50604f53e8509"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index b16978ba..d5f37d5f 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 = "84feab670cce8414ad54f4d19b46291c7fdb14cf" 18SRCREV = "7346857f4f675f57572d54f15cfad9111af2abde"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 09fef6ca..21e06ff6 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,8 +1,7 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
@@ -13,4 +12,4 @@ LIC_FILES_CHKSUM = " \
13 12
14DEPENDS += "qtbase" 13DEPENDS += "qtbase"
15 14
16SRCREV = "612c3041475550837dee7149b9f5e9e4f55c17a0" 15SRCREV = "64ca369c7e3d61f0416bc1fd6a102f0c62924433"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index a467f998..7c155a28 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -30,4 +30,4 @@ do_install_append() {
30 30
31QT_MODULE_BRANCH = "dev" 31QT_MODULE_BRANCH = "dev"
32 32
33SRCREV = "236b6b544fd2049eb46e8f79d13bb7aa35ba002f" 33SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
index 8cf6adae..94cd0484 100644
--- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -1,4 +1,4 @@
1From e80743f15443212823e95d2be82073980a4700bc Mon Sep 17 00:00:00 2001 1From 68ecc4f25789321fc29ec9e4981fcfa27e706f1c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com> 2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200 3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert 4Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert
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
index fe8fe3d7..17d5d514 100644
--- 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
@@ -1,4 +1,4 @@
1From d7943b08bdb858bd2501c93a428ebc13bc9f3cfc Mon Sep 17 00:00:00 2001 1From 95a418157ce5f49052ec1c349581d1811a79c9eb Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 17 Jan 2014 14:33:19 +0100 3Date: Fri, 17 Jan 2014 14:33:19 +0100
4Subject: [PATCH] assistant/help: fix linking of dependent libraries 4Subject: [PATCH] assistant/help: fix linking of dependent libraries
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
index aca2fbce..88c39c74 100644
--- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
@@ -1,4 +1,4 @@
1From 6c5bbd423c3c8f87d00c18384460ab418dccea95 Mon Sep 17 00:00:00 2001 1From a798e469e69e31248610a3b5f29c63c5d12cda26 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 4 Jun 2014 11:28:16 +0200 3Date: Wed, 4 Jun 2014 11:28:16 +0200
4Subject: [PATCH] add noqtwebkit configuration 4Subject: [PATCH] add noqtwebkit configuration
diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
index 4f599805..1a201de9 100644
--- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
+++ b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
@@ -1,4 +1,4 @@
1From 3dfe38ac9b83ee94c8abfe1bb78b14050b0c9a6f Mon Sep 17 00:00:00 2001 1From f805a2bf4a0d35a01726d214279ba1caa81b278f Mon Sep 17 00:00:00 2001
2From: Cody P Schafer <dev@codyps.com> 2From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 9 Jul 2015 11:28:19 -0400 3Date: Thu, 9 Jul 2015 11:28:19 -0400
4Subject: [PATCH] linguist-tools cmake: allow overriding the location for 4Subject: [PATCH] linguist-tools cmake: allow overriding the location for
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index fbc5a38a..56c1205b 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,11 +1,15 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 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 = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ 7 file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \
8 file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6 \ 8 file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=bfdd8aa675169432d6d9b63d056de148 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11" 15"
@@ -31,6 +35,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 35EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" 36EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
33 37
34SRCREV = "d36d2c3026cae67c119384f47cb2680552c81aaf" 38SRCREV = "0597b535f82d3458a1db1828c5e5f725bbcf59fd"
35 39
36BBCLASSEXTEND = "native nativesdk" 40BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 70f57bf8..2a37d144 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -1,11 +1,11 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "(LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 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 = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10" 10"
11 11
@@ -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 = "745f8d5329d0d6d98a8577a254d2ee3e7174634e" 117SRCREV = "2209b3fd6a56bfc44da5369c4fbd345bbca31777"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index a8fcb9c3..ff478f3f 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
10 10
11SRCREV = "42344a4b21b95bce913d60267d554ac17e120af1" 11SRCREV = "626e78c9660cff063e1f9370538b5a424631571c"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index 505f19b1..a214346a 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -1,12 +1,15 @@
1require qt5-native.inc 1require qt5-native.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 15"
@@ -25,4 +28,4 @@ do_install() {
25 oe_runmake install INSTALL_ROOT=${D} 28 oe_runmake install INSTALL_ROOT=${D}
26} 29}
27 30
28SRCREV = "bfa66ccb29f747e2cb07a4f2e561b165be9f211d" 31SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941"
diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
index c199f712..847ba06f 100644
--- a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
+++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
@@ -1,4 +1,4 @@
1From 4334643f02fc333fa8b633ff614fa4ceecf4a8e6 Mon Sep 17 00:00:00 2001 1From 47457635603ddb484a479834a052699cce5b34a3 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Fri, 19 Jul 2013 13:35:14 +0000 3Date: Fri, 19 Jul 2013 13:35:14 +0000
4Subject: [PATCH] Install the qtwaylandscanner tool to the native side 4Subject: [PATCH] Install the qtwaylandscanner tool to the native side
diff --git a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
index 72f29534..a21c1094 100644
--- a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
+++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
@@ -1,4 +1,4 @@
1From 3c5c13f2f991cc79363969fb3873d553dd985e7b Mon Sep 17 00:00:00 2001 1From 733a85c14cb4ade510a0c78b32cd12cb2d70dbbd Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 22 Feb 2014 17:47:44 +0100 3Date: Sat, 22 Feb 2014 17:47:44 +0100
4Subject: [PATCH] examples/wayland: include server-buffer only when building 4Subject: [PATCH] examples/wayland: include server-buffer only when building
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 3 insertions(+), 1 deletion(-) 14 1 file changed, 3 insertions(+), 1 deletion(-)
15 15
16diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro 16diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro
17index b67d12e..c5daad0 100644 17index 503190c..9943c52 100644
18--- a/examples/wayland/wayland.pro 18--- a/examples/wayland/wayland.pro
19+++ b/examples/wayland/wayland.pro 19+++ b/examples/wayland/wayland.pro
20@@ -9,4 +9,6 @@ qtHaveModule(quick) { 20@@ -10,4 +10,6 @@ qtHaveModule(quick) {
21 SUBDIRS += custom-extension 21 SUBDIRS += custom-extension
22 } 22 }
23 23
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index df42f309..b208961c 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -3,12 +3,15 @@ require qt5-git.inc
3 3
4DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native" 4DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native"
5 5
6# There are no LGPLv3-only licensed files in this component. 6LICENSE = "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 )"
7LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
8LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
9 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 8 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
10 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 9 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
11 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
11 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
13 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
14 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
12 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 15 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 16 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
14" 17"
@@ -45,4 +48,4 @@ SRC_URI += " \
45 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ 48 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
46" 49"
47 50
48SRCREV = "bfa66ccb29f747e2cb07a4f2e561b165be9f211d" 51SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 869851b1..45ac8141 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -1,18 +1,20 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5# There are no GPLv2 licensed files in this component.
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
9 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
10 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
11 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
12 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
14" 16"
15 17
16DEPENDS += "qtdeclarative qtwebsockets" 18DEPENDS += "qtdeclarative qtwebsockets"
17 19
18SRCREV = "a2c3b32d08ed24279609a8c01b09c1147a9ff6b9" 20SRCREV = "3836fd7d12777fc53836a72d6542d2fbf2f20ac9"
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
index 5fd3f06a..ccd43e21 100644
--- 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
@@ -1,4 +1,4 @@
1From 66af547c2b3ed473b81421aa239d931d364f644d Mon Sep 17 00:00:00 2001 1From db56cd0fd185a9f3858f5aa6e95b24e63dee119f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 3 Oct 2014 03:52:11 +0200 3Date: Fri, 3 Oct 2014 03:52:11 +0200
4Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc 4Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc
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
index 287bf2b1..b7bd5a4a 100644
--- 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
@@ -1,4 +1,4 @@
1From d28e6ef9c684a7f8f59995995b5cb5a0b1791ee1 Mon Sep 17 00:00:00 2001 1From 793db05d66b7a92ebe069dc76093487489dd8b69 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 30 Jun 2014 20:08:17 +0200 3Date: Mon, 30 Jun 2014 20:08:17 +0200
4Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H 4Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
@@ -10,7 +10,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10 1 file changed, 2 insertions(+), 2 deletions(-) 10 1 file changed, 2 insertions(+), 2 deletions(-)
11 11
12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
13index 26db26f..277bf98 100644 13index 20fb278..7aa0b4a 100644
14--- a/tools/qmake/mkspecs/features/functions.prf 14--- a/tools/qmake/mkspecs/features/functions.prf
15+++ b/tools/qmake/mkspecs/features/functions.prf 15+++ b/tools/qmake/mkspecs/features/functions.prf
16@@ -168,9 +168,9 @@ defineReplace(mocOutput) { 16@@ -168,9 +168,9 @@ defineReplace(mocOutput) {
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
index d5ed1ab7..34f58ded 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
@@ -1,4 +1,4 @@
1From e40a18da9631fa21202836caf69b3343e8bae973 Mon Sep 17 00:00:00 2001 1From de6311b4d556abbe131462a3cd962ae87da59522 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 12:46:58 -0200 3Date: Thu, 24 Dec 2015 12:46:58 -0200
4Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX 4Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
@@ -7,7 +7,7 @@ Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
7Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 7Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9--- 9---
10 src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------ 10 chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------
11 1 file changed, 6 insertions(+), 6 deletions(-) 11 1 file changed, 6 insertions(+), 6 deletions(-)
12 12
13diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc 13diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
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
index 38e97d19..e487c6a5 100644
--- 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
@@ -1,4 +1,4 @@
1From 9f314e95248795bcce787f88bce77ba6058b34c7 Mon Sep 17 00:00:00 2001 1From aa5bb11072bc0e441dc6533f53ed5359c5000088 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100 3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH] functions.prf: Make sure we only use the file name to 4Subject: [PATCH] functions.prf: Make sure we only use the file name to
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11 1 file changed, 2 insertions(+), 1 deletion(-) 11 1 file changed, 2 insertions(+), 1 deletion(-)
12 12
13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
14index 277bf98..d263be4 100644 14index 7aa0b4a..9b3a639 100644
15--- a/tools/qmake/mkspecs/features/functions.prf 15--- a/tools/qmake/mkspecs/features/functions.prf
16+++ b/tools/qmake/mkspecs/features/functions.prf 16+++ b/tools/qmake/mkspecs/features/functions.prf
17@@ -165,7 +165,8 @@ defineReplace(findIncludedMocFiles) { 17@@ -165,7 +165,8 @@ defineReplace(findIncludedMocFiles) {
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
index e0410638..786a383d 100644
--- 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
@@ -1,4 +1,4 @@
1From 617028757a9afd334a0938e617429cca78363d69 Mon Sep 17 00:00:00 2001 1From 6918d25c54ec4bc17a9b612c0d24b0f01be3aca1 Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de> 2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000 3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform 4Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12 1 file changed, 6 insertions(+) 12 1 file changed, 6 insertions(+)
13 13
14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
15index d263be4..879287a 100644 15index 9b3a639..dc5ed1c 100644
16--- a/tools/qmake/mkspecs/features/functions.prf 16--- a/tools/qmake/mkspecs/features/functions.prf
17+++ b/tools/qmake/mkspecs/features/functions.prf 17+++ b/tools/qmake/mkspecs/features/functions.prf
18@@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { 18@@ -5,6 +5,12 @@ defineTest(isPlatformSupported) {
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
index 0a708aff..d10ddf7f 100644
--- 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
@@ -1,4 +1,4 @@
1From d084661f50dbdc6a4014f9a2181462bba770437f Mon Sep 17 00:00:00 2001 1From 6ed60f35761ab268004727be544e9ccf70594211 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200 3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor 4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h 11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
12index 892e99c..a4429d5 100644 12index f13bfd0..0e12244 100644
13--- a/src/webengine/api/qquickwebengineview_p_p.h 13--- a/src/webengine/api/qquickwebengineview_p_p.h
14+++ b/src/webengine/api/qquickwebengineview_p_p.h 14+++ b/src/webengine/api/qquickwebengineview_p_p.h
15@@ -60,6 +60,8 @@ 15@@ -60,6 +60,8 @@
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
index 3a97a4ae..27bd141d 100644
--- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
@@ -1,4 +1,4 @@
1From 0999fbfe32480e737f23ed8fce8f35897b97c20a Mon Sep 17 00:00:00 2001 1From 4105c12d6f91171934f60b4dbb74b1ca7a9a3eb2 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200 3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH] Include dependency to QCoreApplication::translate() 4Subject: [PATCH] Include dependency to QCoreApplication::translate()
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 48c955cc..aedd1417 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -5,8 +5,8 @@ LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \ 6 file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \
7 file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ 7 file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
8 file://LICENSE.LGPL3;md5=3dcffeed712d3c916f9a2d9135703aff \ 8 file://LICENSE.LGPL3;md5=8211fde12cc8a4e2477602f5953f5b71 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 12 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -122,8 +122,10 @@ SRC_URI += " \
122 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 122 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
123" 123"
124 124
125SRCREV_qtwebengine = "63cf26268996ae5580c77095a252696fa549b593" 125SRCREV_qtwebengine = "dbf7dd27428ff755444eac5e975cb69802ac9771"
126SRCREV_chromium = "ba40ed24a6d23e606397b650a7982b0998dbeaf4" 126# This is in git submodule, but we're using the latest in 49-based
127# SRCREV_chromium = "c109a95a067af783e48f93d1cdeca870cda98878"
128SRCREV_chromium = "29c16917b33c26ad32893fa05af971c6c6f50297"
127SRCREV = "${SRCREV_qtwebengine}" 129SRCREV = "${SRCREV_qtwebengine}"
128 130
129SRCREV_FORMAT = "qtwebengine_chromium" 131SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 0920f260..e5075de6 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -1,9 +1,7 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5# There are no GPLv2 licensed files in this component.
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
8 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 6 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
9 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
@@ -19,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
19RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
20RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" 18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
21 19
22SRCREV = "f3f9e2a1b772b718335331a603a6bee748928e49" 20SRCREV = "1ac4ee240214a0e36b504fa1bcbc0c716d50620f"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 58b86c8a..78ca1f54 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -83,4 +83,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
83RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 83RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
84export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 84export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
85 85
86SRCREV = "2e8517924b70a778463e463873eb3d8d0b623eed" 86SRCREV = "76e2732f013732461c09a1d6c6b4c77fcab1c0d0"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 282ae986..8c238db8 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 = "00156d63eea2fb7681a8a00a3144392d6325e5cb" 14SRCREV = "8d17ddfc2f62df56ac067bd0f9736c6e8d37aa97"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index e4228177..9a4d6d7d 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 = "b414120c60ef8c3cc2aad7dca41092647d741a36" 16SRCREV = "bae8bfc7a811af2bf51b227cbf8467e50a2a149a"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 33cedd63..e4c3d7fd 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,18 +1,21 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4# There are no LGPLv3-only licensed files in this component. 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 )"
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 15"
13 16
14DEPENDS += "qtbase" 17DEPENDS += "qtbase"
15 18
16SRCREV = "fb1dc19bf195c530b7f44d18cc927472b9866a46" 19SRCREV = "574d92a43e1fc5480a7f5f79cc6baf566a53349f"
17 20
18BBCLASSEXTEND =+ "native nativesdk" 21BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-11 09:52:07 +0000