summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-08-18 16:43:50 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-08-19 11:17:41 +0300
commitc433b617de5e5363b252a80240f053b103e35e01 (patch)
treeb85b0504d707cfb17ba6ce9989f4270e4f718010
parentce9a8d9537e3baa7d485128a3f41451d7dca7770 (diff)
parentccae79be69c5268df3b47e4e14cea0591c39a531 (diff)
downloadmeta-qt5-c433b617de5e5363b252a80240f053b103e35e01.tar.gz
Merge remote-tracking branch 'meta-qt5/krogoth' into master-mingw
* meta-qt5/krogoth: qtquick1: fix qtwebkit support qtbase: fix drm dependency for eglfs PACKAGECONFIG cmake_qt5.bbclass: when using _prepend don't forget to add space at the end qt5: upgrade to latest revisions in 5.6 branch qtbase: add patch to make Qt5Config modules behave better with cmake builds cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE Change dependency from virtual/mesa to drm in the kms packageconfig. replace base_contains by bb.utils.contains Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch recipes-qt/qt5/qtbase/0011-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtenginio_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick1_git.bb recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qtsystems_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I1da3a7689e16e5ffaa6e31030729a4f2f29c501d
Diffstat
-rw-r--r--classes/cmake_qt5.bbclass5
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb10
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch7
-rw-r--r--recipes-qt/qt5/qt3d_git.bb12
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb12
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch28
-rw-r--r--recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch48
-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.patch2
-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-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch63
-rw-r--r--recipes-qt/qt5/qtbase/0010-Always-build-uic.patch (renamed from recipes-qt/qt5/qtbase/0009-Always-build-uic.patch)6
-rw-r--r--recipes-qt/qt5/qtbase_git.bb17
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb8
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb10
-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.bb8
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb9
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb10
-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.bb10
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb8
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb15
-rw-r--r--recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch6
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb6
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb8
-rw-r--r--recipes-qt/qt5/qtscript_git.bb8
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb9
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb10
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb8
-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.bb8
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb8
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb8
-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.patch2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb8
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb10
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch6
-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.patch6
-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.bb12
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch2
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch2
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch2
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb8
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb10
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb8
62 files changed, 296 insertions, 225 deletions
diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass
index 813ea0c9..3180fd6d 100644
--- a/classes/cmake_qt5.bbclass
+++ b/classes/cmake_qt5.bbclass
@@ -3,7 +3,7 @@ inherit qmake5_paths
3 3
4DEPENDS_prepend = "qtbase " 4DEPENDS_prepend = "qtbase "
5 5
6EXTRA_OECMAKE += " \ 6EXTRA_OECMAKE_prepend = " \
7 -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ 7 -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \
8 -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ 8 -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \
9 -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ 9 -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \
@@ -32,4 +32,5 @@ EXTRA_OECMAKE += " \
32 -DOE_QMAKE_PATH_QT_DOCS=${OE_QMAKE_PATH_QT_DOCS} \ 32 -DOE_QMAKE_PATH_QT_DOCS=${OE_QMAKE_PATH_QT_DOCS} \
33 -DOE_QMAKE_PATH_QT_SETTINGS=${OE_QMAKE_PATH_QT_SETTINGS} \ 33 -DOE_QMAKE_PATH_QT_SETTINGS=${OE_QMAKE_PATH_QT_SETTINGS} \
34 -DOE_QMAKE_PATH_QT_EXAMPLES=${OE_QMAKE_PATH_QT_EXAMPLES} \ 34 -DOE_QMAKE_PATH_QT_EXAMPLES=${OE_QMAKE_PATH_QT_EXAMPLES} \
35 -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS}" 35 -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS} \
36"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 9d276a67..2807a17e 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -5,9 +5,9 @@ HOMEPAGE = "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 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ 8 file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \
9 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ 9 file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13" 13"
@@ -32,7 +32,7 @@ SRC_URI += "\
32 32
33# common for qtbase-native and nativesdk-qtbase 33# common for qtbase-native and nativesdk-qtbase
34SRC_URI += " \ 34SRC_URI += " \
35 file://0009-Always-build-uic.patch \ 35 file://0010-Always-build-uic.patch \
36 file://0001-QMake-Add-option-to-set-qt.conf-file.patch \ 36 file://0001-QMake-Add-option-to-set-qt.conf-file.patch \
37" 37"
38 38
@@ -238,4 +238,4 @@ fakeroot do_generate_qt_environment_file() {
238 238
239addtask generate_qt_environment_file after do_install before do_package 239addtask generate_qt_environment_file after do_install before do_package
240 240
241SRCREV = "6bcd27b957a5ffcfe7665b0979679510e3b2ae3d" 241SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd"
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 c9d22231..8ff47a4b 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 778d0c4515bae5bdeb650fb3e6b3e32a73722b51 Mon Sep 17 00:00:00 2001 1From 339e527e5ca0e1b7839d28e9f140630af634b569 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Allow a tools-only build
8 1 file changed, 6 insertions(+), 1 deletion(-) 8 1 file changed, 6 insertions(+), 1 deletion(-)
9 9
10diff --git a/qt3d.pro b/qt3d.pro 10diff --git a/qt3d.pro b/qt3d.pro
11index a26e76d..263e3c4 100644 11index a26e76d..016fb30 100644
12--- a/qt3d.pro 12--- a/qt3d.pro
13+++ b/qt3d.pro 13+++ b/qt3d.pro
14@@ -1,4 +1,4 @@ 14@@ -1,4 +1,4 @@
@@ -26,6 +26,3 @@ index a26e76d..263e3c4 100644
26+ sub_tools.depends -= sub_src 26+ sub_tools.depends -= sub_src
27+ SUBDIRS = sub_tools 27+ SUBDIRS = sub_tools
28+} 28+}
29--
301.9.1
31
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 496051d0..1b48caf9 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -1,11 +1,11 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "LGPL-3.0 | GPL-2.0" 4LICENSE = "LGPL-3.0 | GPL-2.0+"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ 6 file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \
7 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 7 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
8 file://LICENSE.GPL;md5=05832301944453ec79e40ba3c3cfceec \ 8 file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \
9" 9"
10 10
11DEPENDS += "qtbase" 11DEPENDS += "qtbase"
@@ -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 = "0384f29809186e6a45b13760c9dbb2f8cd3bf251" 30SRCREV = "7fab1fa65675dfd62b1ddf6fed3226e465b37b67"
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 8a6d93e8..30c534ed 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -11,4 +11,4 @@ SRC_URI = " \
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14PV = "5.6.0+git${SRCPV}" 14PV = "5.6.1+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 65054d28..557f8607 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -4,9 +4,9 @@ SECTION = "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)" 5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ 7 file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \
8 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ 8 file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 12"
@@ -22,11 +22,13 @@ SRC_URI += "\
22 file://0006-QOpenGLPaintDevice-sub-area-support.patch \ 22 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
23 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ 23 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
24 file://0002-configure-Separate-host-and-build-platform.patch \ 24 file://0002-configure-Separate-host-and-build-platform.patch \
25 file://0008-configure-paths-for-target-qmake-properly.patch \
26 file://0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
25" 27"
26 28
27# common for qtbase-native and nativesdk-qtbase 29# common for qtbase-native and nativesdk-qtbase
28SRC_URI += " \ 30SRC_URI += " \
29 file://0009-Always-build-uic.patch \ 31 file://0010-Always-build-uic.patch \
30 file://0001-QMake-Add-option-to-set-qt.conf-file.patch \ 32 file://0001-QMake-Add-option-to-set-qt.conf-file.patch \
31" 33"
32 34
@@ -114,4 +116,4 @@ do_install() {
114 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 116 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
115} 117}
116 118
117SRCREV = "6bcd27b957a5ffcfe7665b0979679510e3b2ae3d" 119SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd"
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 4843c592..b52ca8f6 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 cabe9683b82493e2547e87ae0057f44f71efe519 Mon Sep 17 00:00:00 2001 1From 46260d1a93e10a6a6f47f38d0b4355b4b63a4682 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
@@ -52,10 +52,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
52 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 52 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
53 53
54diff --git a/configure b/configure 54diff --git a/configure b/configure
55index 3e97c98..88a308d 100755 55index f4c7813..9ab6a9d 100755
56--- a/configure 56--- a/configure
57+++ b/configure 57+++ b/configure
58@@ -342,6 +342,16 @@ getQMakeConf() 58@@ -343,6 +343,16 @@ getQMakeConf()
59 getSingleQMakeVariable "$1" "$specvals" 59 getSingleQMakeVariable "$1" "$specvals"
60 } 60 }
61 61
@@ -72,8 +72,8 @@ index 3e97c98..88a308d 100755
72 getXQMakeConf() 72 getXQMakeConf()
73 { 73 {
74 if [ -z "$xspecvals" ]; then 74 if [ -z "$xspecvals" ]; then
75@@ -351,6 +361,16 @@ getXQMakeConf() 75@@ -367,6 +377,16 @@ testXConfig()
76 getSingleQMakeVariable "$1" "$xspecvals" 76 esac
77 } 77 }
78 78
79+# OE qmake.conf is reading some variables from shell env 79+# OE qmake.conf is reading some variables from shell env
@@ -89,7 +89,7 @@ index 3e97c98..88a308d 100755
89 compilerSupportsFlag() 89 compilerSupportsFlag()
90 { 90 {
91 cat >conftest.cpp <<EOF 91 cat >conftest.cpp <<EOF
92@@ -557,24 +577,14 @@ fi 92@@ -573,24 +593,14 @@ fi
93 # initalize variables 93 # initalize variables
94 #------------------------------------------------------------------------------- 94 #-------------------------------------------------------------------------------
95 95
@@ -120,7 +120,7 @@ index 3e97c98..88a308d 100755
120 fi'` 120 fi'`
121 eval "$cmd" 121 eval "$cmd"
122 done 122 done
123@@ -3418,7 +3428,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then 123@@ -3443,7 +3453,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
124 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no 124 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
125 fi 125 fi
126 126
@@ -129,7 +129,7 @@ index 3e97c98..88a308d 100755
129 129
130 TEST_COMPILER=$QMAKE_CONF_COMPILER 130 TEST_COMPILER=$QMAKE_CONF_COMPILER
131 131
132@@ -3475,7 +3485,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then 132@@ -3504,7 +3514,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
133 exit 1 133 exit 1
134 fi 134 fi
135 fi 135 fi
@@ -138,7 +138,7 @@ index 3e97c98..88a308d 100755
138 138
139 GCC_MACHINE_DUMP= 139 GCC_MACHINE_DUMP=
140 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac 140 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
141@@ -3976,6 +3986,14 @@ setBootstrapVariable() 141@@ -4005,6 +4015,14 @@ setBootstrapVariable()
142 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" 142 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
143 } 143 }
144 144
@@ -153,7 +153,7 @@ index 3e97c98..88a308d 100755
153 # build qmake 153 # build qmake
154 if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 154 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
155 echo "Creating qmake..." 155 echo "Creating qmake..."
156@@ -4014,14 +4032,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 156@@ -4043,14 +4061,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
157 fi 157 fi
158 158
159 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= 159 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -174,9 +174,9 @@ index 3e97c98..88a308d 100755
174+ setBootstrapEvalVariable QMAKE_LFLAGS 174+ setBootstrapEvalVariable QMAKE_LFLAGS
175+ setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS 175+ setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS
176 176
177 if [ "$CFG_RELEASE_TOOLS" = "yes" ]; then 177 if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then
178 setBootstrapVariable QMAKE_CFLAGS_RELEASE 178 setBootstrapVariable QMAKE_CFLAGS_RELEASE
179@@ -4070,6 +4088,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 179@@ -4093,6 +4111,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
180 \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ 180 \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \
181 \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" 181 \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\""
182 EXEEXT= 182 EXEEXT=
@@ -185,10 +185,10 @@ index 3e97c98..88a308d 100755
185 if [ "$BUILD_ON_MAC" = "yes" ]; then 185 if [ "$BUILD_ON_MAC" = "yes" ]; then
186 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" 186 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile"
187diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 187diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
188index 6b37a04..dcf6025 100644 188index a3ec227..eef6006 100644
189--- a/mkspecs/features/configure.prf 189--- a/mkspecs/features/configure.prf
190+++ b/mkspecs/features/configure.prf 190+++ b/mkspecs/features/configure.prf
191@@ -63,12 +63,12 @@ defineTest(qtCompileTest) { 191@@ -71,12 +71,12 @@ defineTest(qtCompileTest) {
192 } 192 }
193 193
194 # Clean up after previous run 194 # Clean up after previous run
diff --git a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
index edd5d9a9..e596847b 100644
--- a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
+++ b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
@@ -1,4 +1,4 @@
1From 4b7a986512e5f3accbca6010829e7e094d53ac29 Mon Sep 17 00:00:00 2001 1From 6b92250b1e3268c888319f76ca4cf6d9eee71b54 Mon Sep 17 00:00:00 2001
2From: David Schulz <david.schulz@theqtcompany.com> 2From: David Schulz <david.schulz@theqtcompany.com>
3Date: Mon, 12 Oct 2015 09:55:30 +0200 3Date: Mon, 12 Oct 2015 09:55:30 +0200
4Subject: [PATCH] configure: Separate host and build platform. 4Subject: [PATCH] configure: Separate host and build platform.
@@ -51,7 +51,7 @@ index c50bd8b..cfb47de 100755
51 51
52 ARCH="" 52 ARCH=""
53diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test 53diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
54index 598e2a2..f92560f 100755 54index 69d4285..17e4154 100755
55--- a/config.tests/unix/compile.test 55--- a/config.tests/unix/compile.test
56+++ b/config.tests/unix/compile.test 56+++ b/config.tests/unix/compile.test
57@@ -10,7 +10,9 @@ OUTDIR=$5 57@@ -10,7 +10,9 @@ OUTDIR=$5
@@ -65,7 +65,7 @@ index 598e2a2..f92560f 100755
65 LFLAGS="$SYSROOT_FLAG" 65 LFLAGS="$SYSROOT_FLAG"
66 INCLUDEPATH="" 66 INCLUDEPATH=""
67 CFLAGS="$SYSROOT_FLAG" 67 CFLAGS="$SYSROOT_FLAG"
68@@ -73,7 +75,8 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 68@@ -70,7 +72,8 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1
69 rm -f "$EXE" "${EXE}.exe" 69 rm -f "$EXE" "${EXE}.exe"
70 70
71 set -- \ 71 set -- \
@@ -76,7 +76,7 @@ index 598e2a2..f92560f 100755
76 -spec "$QMKSPEC" \ 76 -spec "$QMKSPEC" \
77 "CONFIG+=$QMAKE_CONFIG" \ 77 "CONFIG+=$QMAKE_CONFIG" \
78diff --git a/configure b/configure 78diff --git a/configure b/configure
79index d5214bf..0334dfc 100755 79index 2da6a78..85123e9 100755
80--- a/configure 80--- a/configure
81+++ b/configure 81+++ b/configure
82@@ -105,9 +105,11 @@ QT_CONFIG= 82@@ -105,9 +105,11 @@ QT_CONFIG=
@@ -192,7 +192,7 @@ index d5214bf..0334dfc 100755
192 bindir) 192 bindir)
193 QT_INSTALL_BINS="$VAL" 193 QT_INSTALL_BINS="$VAL"
194 ;; 194 ;;
195@@ -1449,6 +1472,11 @@ while [ "$#" -gt 0 ]; do 195@@ -1456,6 +1479,11 @@ while [ "$#" -gt 0 ]; do
196 DEV_VAL=`echo $VAL | cut -d '=' -f 2-` 196 DEV_VAL=`echo $VAL | cut -d '=' -f 2-`
197 DeviceVar set $DEV_VAR "$DEV_VAL" 197 DeviceVar set $DEV_VAR "$DEV_VAL"
198 ;; 198 ;;
@@ -204,7 +204,7 @@ index d5214bf..0334dfc 100755
204 qpa) 204 qpa)
205 QT_QPA_DEFAULT_PLATFORM="$VAL" 205 QT_QPA_DEFAULT_PLATFORM="$VAL"
206 ;; 206 ;;
207@@ -2699,6 +2727,8 @@ Additional options: 207@@ -2696,6 +2724,8 @@ Additional options:
208 -device-option <key=value> ... Add device specific options for the device mkspec 208 -device-option <key=value> ... Add device specific options for the device mkspec
209 (experimental) 209 (experimental)
210 210
@@ -213,7 +213,7 @@ index d5214bf..0334dfc 100755
213 * -no-separate-debug-info . Do not store debug information in a separate file. 213 * -no-separate-debug-info . Do not store debug information in a separate file.
214 -separate-debug-info .... Strip debug information into a separate file. 214 -separate-debug-info .... Strip debug information into a separate file.
215 215
216@@ -2730,6 +2760,9 @@ Additional options: 216@@ -2727,6 +2757,9 @@ Additional options:
217 -sysroot <dir> ...... Sets <dir> as the target compiler's and qmake's sysroot and also sets pkg-config paths. 217 -sysroot <dir> ...... Sets <dir> as the target compiler's and qmake's sysroot and also sets pkg-config paths.
218 -no-gcc-sysroot ..... When using -sysroot, it disables the passing of --sysroot to the compiler 218 -no-gcc-sysroot ..... When using -sysroot, it disables the passing of --sysroot to the compiler
219 219
@@ -223,7 +223,7 @@ index d5214bf..0334dfc 100755
223 -no-feature-<feature> Do not compile in <feature>. 223 -no-feature-<feature> Do not compile in <feature>.
224 -feature-<feature> .. Compile in <feature>. The available features 224 -feature-<feature> .. Compile in <feature>. The available features
225 are described in src/corelib/global/qfeatures.txt 225 are described in src/corelib/global/qfeatures.txt
226@@ -3296,7 +3329,7 @@ if [ -d "$XPLATFORM" ]; then 226@@ -3306,7 +3339,7 @@ if [ -d "$XPLATFORM" ]; then
227 else 227 else
228 XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}" 228 XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}"
229 fi 229 fi
@@ -232,7 +232,7 @@ index d5214bf..0334dfc 100755
232 QT_CROSS_COMPILE=yes 232 QT_CROSS_COMPILE=yes
233 QMAKE_CONFIG="$QMAKE_CONFIG cross_compile" 233 QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
234 QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile" 234 QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile"
235@@ -4069,7 +4102,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 235@@ -4082,7 +4115,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
236 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)" 236 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
237 fi 237 fi
238 238
@@ -242,7 +242,7 @@ index d5214bf..0334dfc 100755
242 EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE" 242 EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE"
243 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE" 243 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE"
244 EXTRA_OBJS="qfilesystemengine_win.o \ 244 EXTRA_OBJS="qfilesystemengine_win.o \
245@@ -4088,7 +4122,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 245@@ -4101,7 +4135,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
246 \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\"" 246 \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\""
247 EXTRA_LFLAGS="$EXTRA_LFLAGS -static -s -lole32 -luuid -ladvapi32 -lkernel32" 247 EXTRA_LFLAGS="$EXTRA_LFLAGS -static -s -lole32 -luuid -ladvapi32 -lkernel32"
248 EXEEXT=".exe" 248 EXEEXT=".exe"
@@ -252,7 +252,7 @@ index d5214bf..0334dfc 100755
252 EXTRA_OBJS="qfilesystemengine_unix.o \ 252 EXTRA_OBJS="qfilesystemengine_unix.o \
253 qfilesystemiterator_unix.o \ 253 qfilesystemiterator_unix.o \
254 qfsfileengine_unix.o \ 254 qfsfileengine_unix.o \
255@@ -4098,8 +4133,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 255@@ -4111,8 +4146,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
256 \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ 256 \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \
257 \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" 257 \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\""
258 EXEEXT= 258 EXEEXT=
@@ -263,7 +263,7 @@ index d5214bf..0334dfc 100755
263 if [ "$BUILD_ON_MAC" = "yes" ]; then 263 if [ "$BUILD_ON_MAC" = "yes" ]; then
264 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" 264 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile"
265 echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" 265 echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
266@@ -4117,6 +4152,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 266@@ -4130,6 +4165,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
267 \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \ 267 \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \
268 \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\"" 268 \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\""
269 fi 269 fi
@@ -271,7 +271,7 @@ index d5214bf..0334dfc 100755
271 echo >>"$mkfile" 271 echo >>"$mkfile"
272 adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` 272 adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
273 adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` 273 adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
274@@ -4186,7 +4222,81 @@ QTCONFFILE="$outpath/bin/qt.conf" 274@@ -4199,7 +4235,81 @@ QTCONFFILE="$outpath/bin/qt.conf"
275 cat > "$QTCONFFILE" <<EOF 275 cat > "$QTCONFFILE" <<EOF
276 [EffectivePaths] 276 [EffectivePaths]
277 Prefix=.. 277 Prefix=..
@@ -353,7 +353,7 @@ index d5214bf..0334dfc 100755
353 if [ x"$relpath" != x"$outpath" ]; then 353 if [ x"$relpath" != x"$outpath" ]; then
354 cat >> "$QTCONFFILE" <<EOF 354 cat >> "$QTCONFFILE" <<EOF
355 [EffectiveSourcePaths] 355 [EffectiveSourcePaths]
356@@ -4194,6 +4304,9 @@ Prefix=$relpath 356@@ -4207,6 +4317,9 @@ Prefix=$relpath
357 EOF 357 EOF
358 fi 358 fi
359 359
@@ -363,7 +363,7 @@ index d5214bf..0334dfc 100755
363 #------------------------------------------------------------------------------- 363 #-------------------------------------------------------------------------------
364 # write out device config before we run the test. 364 # write out device config before we run the test.
365 #------------------------------------------------------------------------------- 365 #-------------------------------------------------------------------------------
366@@ -4206,9 +4319,20 @@ else 366@@ -4219,9 +4332,20 @@ else
367 fi 367 fi
368 368
369 #------------------------------------------------------------------------------- 369 #-------------------------------------------------------------------------------
@@ -385,7 +385,7 @@ index d5214bf..0334dfc 100755
385 if [ $? != "0" ]; then 385 if [ $? != "0" ]; then
386 echo "Failed to process makespec for platform '$XPLATFORM'" 386 echo "Failed to process makespec for platform '$XPLATFORM'"
387 if [ "$OPT_VERBOSE" = "yes" ]; then 387 if [ "$OPT_VERBOSE" = "yes" ]; then
388@@ -4224,7 +4348,7 @@ fi 388@@ -4237,7 +4361,7 @@ fi
389 #------------------------------------------------------------------------------- 389 #-------------------------------------------------------------------------------
390 if [ -z "$PKG_CONFIG" ]; then 390 if [ -z "$PKG_CONFIG" ]; then
391 # See if PKG_CONFIG is set in the mkspec: 391 # See if PKG_CONFIG is set in the mkspec:
@@ -394,16 +394,16 @@ index d5214bf..0334dfc 100755
394 [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG" 394 [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG"
395 fi 395 fi
396 if [ -z "$PKG_CONFIG" ]; then 396 if [ -z "$PKG_CONFIG" ]; then
397@@ -4299,7 +4423,7 @@ compileTest() 397@@ -4313,7 +4437,7 @@ compileTest()
398 if [ "$CFG_SHARED" = "no" ]; then
399 test_config="$QMAKE_CONFIG static" 398 test_config="$QMAKE_CONFIG static"
400 fi 399 fi
400 echo $ECHO_N "checking for $name... $ECHO_C"
401- "$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS "$@" 401- "$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS "$@"
402+ "$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" "$CFG_QMAKE_PATH" "$QTCONFFILE" $I_FLAGS $D_FLAGS $L_FLAGS "$@" 402+ "$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" "$CFG_QMAKE_PATH" "$QTCONFFILE" $I_FLAGS $D_FLAGS $L_FLAGS "$@"
403 } 403 }
404 404
405 compileTestWithPkgConfig() 405 compileTestWithPkgConfig()
406@@ -4348,7 +4472,7 @@ compileTestWithPkgConfig() 406@@ -4362,7 +4486,7 @@ compileTestWithPkgConfig()
407 407
408 # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is 408 # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is
409 OUTFILE=$outpath/arch.result 409 OUTFILE=$outpath/arch.result
@@ -412,7 +412,7 @@ index d5214bf..0334dfc 100755
412 if [ $? -eq 0 ]; then 412 if [ $? -eq 0 ]; then
413 eval `cat "$OUTFILE"` 413 eval `cat "$OUTFILE"`
414 else 414 else
415@@ -4361,7 +4485,7 @@ rm -f "$OUTFILE" 2>/dev/null 415@@ -4375,7 +4499,7 @@ rm -f "$OUTFILE" 2>/dev/null
416 416
417 if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then 417 if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then
418 # Do the same test again, using the host compiler 418 # Do the same test again, using the host compiler
@@ -421,7 +421,7 @@ index d5214bf..0334dfc 100755
421 if [ $? -eq 0 ]; then 421 if [ $? -eq 0 ]; then
422 eval `cat "$OUTFILE"` 422 eval `cat "$OUTFILE"`
423 else 423 else
424@@ -4577,7 +4701,7 @@ fi 424@@ -4591,7 +4715,7 @@ fi
425 425
426 # detect mips_dsp support 426 # detect mips_dsp support
427 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then 427 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then
@@ -430,7 +430,7 @@ index d5214bf..0334dfc 100755
430 CFG_MIPS_DSP=yes 430 CFG_MIPS_DSP=yes
431 else 431 else
432 CFG_MIPS_DSP=no 432 CFG_MIPS_DSP=no
433@@ -4588,7 +4712,7 @@ fi 433@@ -4602,7 +4726,7 @@ fi
434 434
435 # detect mips_dspr2 support 435 # detect mips_dspr2 support
436 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then 436 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then
@@ -439,7 +439,7 @@ index d5214bf..0334dfc 100755
439 CFG_MIPS_DSPR2=yes 439 CFG_MIPS_DSPR2=yes
440 else 440 else
441 CFG_MIPS_DSPR2=no 441 CFG_MIPS_DSPR2=no
442@@ -7482,7 +7606,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null 442@@ -7495,7 +7619,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null
443 cd .. 443 cd ..
444 fi 444 fi
445 445
@@ -477,7 +477,7 @@ index e0383ef..9281d3e 100644
477 # Provide a function to be used by mkspecs 477 # Provide a function to be used by mkspecs
478 defineTest(deviceSanityCheckCompiler) { 478 defineTest(deviceSanityCheckCompiler) {
479diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 479diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
480index 8639695..e250959 100644 480index 4a1d265..ee1ada3 100644
481--- a/mkspecs/features/qt_functions.prf 481--- a/mkspecs/features/qt_functions.prf
482+++ b/mkspecs/features/qt_functions.prf 482+++ b/mkspecs/features/qt_functions.prf
483@@ -70,7 +70,7 @@ defineTest(qtHaveModule) { 483@@ -70,7 +70,7 @@ 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 a35b6a2a..233a9c57 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 7e5713e7f4807e204cd4a9f874cb1ca2985fc630 Mon Sep 17 00:00:00 2001 1From 156a2e3f61258de4127d582895376a1c674e30a6 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 75b84ff..ab36fa6 100644 71index be08a2a..0310cbb 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 75b84ff..ab36fa6 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 cc8ed87..b7d4be2 100644 95index de9ba9d..e59c5e5 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 e21b36d3..275bd715 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 e6ed023b0210375e594b7b61dfb620deb486ee8c Mon Sep 17 00:00:00 2001 1From 4316f6b00153765fd39a0054896910049c607169 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 f2611ed..24a61db 100755 17index 225b9f3..746a088 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3930,10 +3930,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ 20@@ -3959,10 +3959,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 b6758052..be1a6c30 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 05a3901af7a467f9ea5fa9e6f63a574d8d2a9f77 Mon Sep 17 00:00:00 2001 1From af6fed015c4d685e922ed6761262610910ea2219 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
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 2fab8884..ad9aef65 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 6a0d4af2083dbacddb98245c0b4b83c6e014a1ae Mon Sep 17 00:00:00 2001 1From 92eafaf0f5902916ca87b8e3bd63040602ff18bf 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 7ca19133..85ec8e89 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 b5c826a39760519010884547d6981c3af031d9c8 Mon Sep 17 00:00:00 2001 1From 92b13af05077dec0d194d4018e36568146d41232 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 24a61db..2e99d39 100755 22index 746a088..d98ea53 100755
23--- a/configure 23--- a/configure
24+++ b/configure 24+++ b/configure
25@@ -3875,8 +3875,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then 25@@ -3904,8 +3904,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 24a61db..2e99d39 100755
38 38
39 QT_CONFIGURE_STR_OFF=0 39 QT_CONFIGURE_STR_OFF=0
40 40
41@@ -3909,7 +3914,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS 41@@ -3938,7 +3943,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 24a61db..2e99d39 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@@ -3921,6 +3930,12 @@ addConfStr "$shortspec" 54@@ -3950,6 +3959,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 24a61db..2e99d39 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@@ -3933,7 +3948,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 67@@ -3962,7 +3977,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/0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
new file mode 100644
index 00000000..1825ac23
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
@@ -0,0 +1,63 @@
1From e70b35ba680f2138f0a7ff65852e76248462d459 Mon Sep 17 00:00:00 2001
2From: Pascal Bach <pascal.bach@siemens.com>
3Date: Wed, 11 May 2016 15:20:41 +0200
4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
5 isn't set
6
7This prevents errors like:
8
9| The imported target "Qt5::Core" references the file
10|
11| "/qmake"
12|
13| but this file does not exist. Possible reasons include:
14
15Which happen if CMake is used without setting OE_QMAKE_PATH_EXTERNAL_HOST_BINS.
16To achieve this a check for OE_QMAKE_PATH_EXTERNAL_HOST_BINS is added to each Qt5*Config.cmake
17file. And in the case where the variable is not set we just return which is basically
18equal to telling CMake that Qt5 wasn't found.
19
20Upstream-Status: Pending
21 The patch only makes sense in connection with other patches included here.
22 Specifically this are:
23 - 0003-Add-external-hostbindir-option.patch
24 - 0010-Add-external-hostbindir-option-for-native-sdk.patch
25
26Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
27---
28 mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++
29 src/corelib/Qt5Config.cmake.in | 5 +++++
30 2 files changed, 10 insertions(+)
31
32diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
33index d2358ca..feb73c0 100644
34--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
35+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
36@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
37 endif()
38 !!ENDIF
39
40+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS)
41+ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined")
42+ return()
43+endif()
44+
45 !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
46 !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
47 set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
48diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in
49index a872d0e..233d663 100644
50--- a/src/corelib/Qt5Config.cmake.in
51+++ b/src/corelib/Qt5Config.cmake.in
52@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9)
53 message(FATAL_ERROR \"Qt5 requires at least CMake version 2.8.9\")
54 endif()
55
56+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS)
57+ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined")
58+ return()
59+endif()
60+
61 if (NOT Qt5_FIND_COMPONENTS)
62 set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\")
63 set(Qt5_FOUND False)
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
index 230c966d..a5915e93 100644
--- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
@@ -1,4 +1,4 @@
1From 49b2100ff86ab5b4977608903b30cb71075592c6 Mon Sep 17 00:00:00 2001 1From 609d853b42509e8c7da4409e2c97dc44834db564 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 1671338..83de483 100644 17index ed752c3..dbb0b56 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@@ -186,7 +186,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 } 21 }
22 } 22 }
23 } 23 }
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index c99eddd2..467b1f9f 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -3,9 +3,9 @@ require 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 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ 6 file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \
7 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ 7 file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \
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=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11" 11"
@@ -19,6 +19,8 @@ SRC_URI += "\
19 file://0006-QOpenGLPaintDevice-sub-area-support.patch \ 19 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
20 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ 20 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
21 file://0002-configure-Separate-host-and-build-platform.patch \ 21 file://0002-configure-Separate-host-and-build-platform.patch \
22 file://0008-configure-paths-for-target-qmake-properly.patch \
23 file://0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
22" 24"
23 25
24DEPENDS += "qtbase-native" 26DEPENDS += "qtbase-native"
@@ -79,8 +81,9 @@ PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg"
79PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" 81PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng"
80PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" 82PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib"
81PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre" 83PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre"
82PACKAGECONFIG[gl] = "-opengl desktop -no-eglfs,,virtual/libgl" 84PACKAGECONFIG[eglfs] = "-eglfs,-no-eglfs,drm"
83PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl" 85PACKAGECONFIG[gl] = "-opengl desktop,,virtual/libgl"
86PACKAGECONFIG[gles2] = "-opengl es2,,virtual/libgles2 virtual/egl"
84PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" 87PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib"
85PACKAGECONFIG[cups] = "-cups,-no-cups,cups" 88PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
86PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" 89PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
@@ -116,7 +119,7 @@ PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+"
116PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" 119PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
117PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" 120PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
118PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" 121PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
119PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" 122PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
120# needed for qtwebkit 123# needed for qtwebkit
121PACKAGECONFIG[icu] = "-icu,-no-icu,icu" 124PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
122PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" 125PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
@@ -248,4 +251,4 @@ sysroot_stage_dirs_append() {
248 rm -rf $to${OE_QMAKE_PATH_QT_FONTS} 251 rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
249} 252}
250 253
251SRCREV = "6bcd27b957a5ffcfe7665b0979679510e3b2ae3d" 254SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index b28bab0c..c7ec72ab 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -3,11 +3,11 @@ require qt5-git.inc
3 3
4LICENSE = "LGPL-3.0 | GPL-3.0" 4LICENSE = "LGPL-3.0 | GPL-3.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 6 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
7 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 7 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
8 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 8 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
9" 9"
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "1a19a68e76205650b55fea48477deb95bf328412" 13SRCREV = "95884805facd1721eea025467afd85ed64a70504"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index a4686729..94c331b5 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -3,12 +3,12 @@ require 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 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
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=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase qtdeclarative" 14DEPENDS += "qtbase qtdeclarative"
@@ -25,4 +25,4 @@ do_configure_prepend() {
25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
26} 26}
27 27
28SRCREV = "a084e2160a345162681af984d9c265f619be7124" 28SRCREV = "71a0d199a29001cc31bfde15aabcc53cf88aae1e"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
index ee568200..b0e5fe85 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 d26a676827ef2d64b4627090690d3240e62f6565 Mon Sep 17 00:00:00 2001 1From 8228a74e72ad130f8ab91dd3ebe1969c0acfd81b 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
@@ -60,7 +60,7 @@ index c6d442e..3181dcd 100644
60+QT += core-private qml-private testlib gui gui-private quick 60+QT += core-private qml-private testlib gui gui-private quick
61 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 61 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
62diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro 62diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
63index 7662cb1..a8f8ae2 100644 63index 175ed42..83e5d7d 100644
64--- a/tests/auto/qmltest/qmltest.pro 64--- a/tests/auto/qmltest/qmltest.pro
65+++ b/tests/auto/qmltest/qmltest.pro 65+++ b/tests/auto/qmltest/qmltest.pro
66@@ -4,6 +4,7 @@ CONFIG += qmltestcase 66@@ -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 60c9685f..915d924d 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 9d39293e354120a9ec5e92c87b4cd695acdeb3f5 Mon Sep 17 00:00:00 2001 1From b958ab5685384a4c612f13c8cb83fa6b87fee18e 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 f44be8b6..ecbca7a2 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -4,9 +4,9 @@ require qt5-git.inc
4# There are no LGPLv3-only licensed files in this component. 4# There are no LGPLv3-only licensed files in this component.
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 12"
@@ -39,6 +39,6 @@ do_install_append_class-nativesdk() {
39 39
40EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 40EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
41 41
42SRCREV = "dbf7efde1e04ac0ff445f64438078d87eb035b68" 42SRCREV = "a05f59388e004160899d5d311884cfabe10c3b8c"
43 43
44BBCLASSEXTEND =+ "native nativesdk" 44BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 0f37e9a5..6135898b 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -3,12 +3,13 @@ require qt5-git.inc
3 3
4LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 4LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
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 = "d5aec18177acc122b0b7c39a90fbb09d388a01b3" 15SRCREV = "6c37300c667e3049178f049a5b86e7ea955c9671"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 9e2d5e6d..24ae3e1b 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -5,16 +5,16 @@ require qt5-git.inc
5# There are no GPLv2 licensed files in this component. 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)" 6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 8 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 9 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 13 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
14" 14"
15 15
16DEPENDS += "qtdeclarative" 16DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = "" 18RDEPENDS_${PN}-dev = ""
19 19
20SRCREV = "35179f6b3116f1cee4586faa7c4f751e6d2e00af" 20SRCREV = "0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b5"
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 12118980..15b69f4f 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 c4c008c46291be290312b5674af1c1b9c446fa8e Mon Sep 17 00:00:00 2001 1From ff035d111c39a0f3b1b5a93e99d266341878f573 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 9cc7a3c7..37e1f401 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -3,12 +3,12 @@ require 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 & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
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=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+
28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" 28EXTRA_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)}" 29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
30 30
31SRCREV = "6415dae76eb8586f6e520961a76996df2425476d" 31SRCREV = "99f384ac2353df89a1522e47c96cae6a945749e1"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index b6f6af0b..59be91fc 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -3,12 +3,12 @@ require 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 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
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=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
@@ -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 = "f897775850dfbe0e668e9c8b428537e8bb096c01" 32SRCREV = "04762a9eecafc80ebeb90c06258de551d451497f"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 5c176d07..71e78abb 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -4,9 +4,9 @@ require qt5-git.inc
4# There are no LGPLv3-only licensed files in this component. 4# There are no LGPLv3-only licensed files in this component.
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 12"
@@ -35,4 +35,4 @@ SRC_URI += "\
35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ 35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
36" 36"
37 37
38SRCREV = "6d5f375644624b977b168928ae09227a9d28547f" 38SRCREV = "d7d31d63db5f0029a4a5e24d998601baee8bade0"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index d5239749..a2163ffe 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -6,21 +6,24 @@ require qt5-git.inc
6# Note that some files are LGPL-2.1 only without The-Qt-Company-Qt-LGPL-Exception-1.1. 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)" 7LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
8LIC_FILES_CHKSUM = " \ 8LIC_FILES_CHKSUM = " \
9 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 9 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
10 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 10 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
11 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 12 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 14 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
14" 15"
15 16
16DEPENDS += "qtscript qtsvg qtxmlpatterns" 17DEPENDS += "qtscript qtsvg qtxmlpatterns"
17# qttools 18# qttools
18 19
19PACKAGECONFIG ??= "webkit" 20PACKAGECONFIG ??= "webkit"
20PACKAGECONFIG[webkit] = "CONFIG+=enable-webkit,CONFIG-=enable-webkit,qtwebkit" 21PACKAGECONFIG[webkit] = ",,qtwebkit"
22
23EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'webkit', '', 'CONFIG+=noqtwebkit', d)}"
21 24
22do_configure_prepend() { 25do_configure_prepend() {
23 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro 26 sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro
24} 27}
25 28
26SRCREV = "212653fea189ad1f5203fe2b5c12caba6f13c72a" 29SRCREV = "e90625f00a3727ca1c89a94407b7686327d03c19"
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 9ad92a1c..fb7c5e1a 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 0dcc16dafac2fec76c178f3b3195f57bb2ac3d8e 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'
@@ -11,10 +11,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
11 1 file changed, 1 insertion(+) 11 1 file changed, 1 insertion(+)
12 12
13diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/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 2e03f74..3d1b3c8 100644
15--- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp 15--- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
16+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp 16+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
17@@ -54,6 +54,7 @@ 17@@ -44,6 +44,7 @@
18 #include <QtGui/QTextCursor> 18 #include <QtGui/QTextCursor>
19 #include <QtGui/QFontDatabase> 19 #include <QtGui/QFontDatabase>
20 #include <QtCore/QFileInfo> 20 #include <QtCore/QFileInfo>
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 22316297..66ec15e9 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -4,12 +4,12 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" 4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
7 file://LICENSE.LGPLv3;md5=8ba7f2099d17d636d5fcc8303bb17587 \ 7 file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9" 9"
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" 13FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt"
14 14
15SRCREV = "f3212709f2cb19f61f09ba551934101800586d1a" 15SRCREV = "eed9b9dd83f0db9cbfe794072d8f5147e3d1234a"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 0912169f..42d504e2 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -3,10 +3,10 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-2.0" 4LICENSE = "GFDL-1.3 & BSD & 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.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 7 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
8 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 9 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
9 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
10" 10"
11 11
12DEPENDS += "qtdeclarative" 12DEPENDS += "qtdeclarative"
@@ -17,4 +17,4 @@ SRC_URI += " \
17 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 17 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
18" 18"
19 19
20SRCREV = "7e33119c487b6ce7ee1b7e8fc7b9b862adba1c91" 20SRCREV = "84a26f223b220a444dec2b43fffc71dab7e00d1d"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index d3d421fb..21199f76 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -5,9 +5,9 @@ require qt5-git.inc
5# Note that some files are LGPL-2.1 only without The-Qt-Company-Qt-LGPL-Exception-1.1. 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)" 6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 8 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 9 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13" 13"
@@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
27 27
28DEPENDS += "qtbase" 28DEPENDS += "qtbase"
29 29
30SRCREV = "76b5b0c3598a595c61f0cb274b392feeaf3e8dc3" 30SRCREV = "9dc78a2d847bca5ec7b1445356523383a030d7ce"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 4d6dfa88..e599617c 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -5,14 +5,13 @@ require qt5-git.inc
5# There are no GPLv2 licensed files in this component. 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)" 6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 8 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 9 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
14" 13"
15 14
16DEPENDS += "qtbase qtdeclarative" 15DEPENDS += "qtbase qtdeclarative"
17 16
18SRCREV = "6189199557a2b8eb981f37e6370b47c25b224b4e" 17SRCREV = "8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index d2dd424f..10780bea 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -5,14 +5,14 @@ require qt5-git.inc
5# other qt* components use :/ 5# other qt* components use :/
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 8 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 9 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ 11 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
12 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ 12 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
13 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 13 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
14" 14"
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "9c9255eda50af191636ff9f18df35567c307dd8c" 18SRCREV = "133dbd59fb04974149d2140b267fce91a7cfd4a2"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 49b7c38f..145ac65f 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -4,13 +4,13 @@ require qt5-git.inc
4# There are no LGPLv3-only licensed files in this component. 4# There are no LGPLv3-only licensed files in this component.
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 12"
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "600ae02bce34b5cd56c1ddc99553bf661ae96b1a" 16SRCREV = "2d55b4996eaa26c973afdf15f6f703c0a1840a96"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 656895ef..de316a55 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -33,4 +33,4 @@ QT_MODULE_BRANCH = "dev"
33# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 33# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
34# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6 34# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6
35 35
36SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" 36SRCREV = "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 14e5c0be..dcae6152 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 c6d62fcf2e02b5a86c36b4afd78dfb7a3f29ad91 Mon Sep 17 00:00:00 2001 1From 782bef8198cc5aacd7b11903a4e4739950d6b90c 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 b5e92934..b3145136 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 34f23c43f1c656ccd424528821a9ac65a98c5fec Mon Sep 17 00:00:00 2001 1From b7e29ffe5f00847de7e87a183e0ff2ecf0cccb20 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 f0f40b7a..ea487c52 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 b77f225e25360832074692681c5ff7c13862102d Mon Sep 17 00:00:00 2001 1From 79a9f6a65355203fc49fa610f6bb9fe8ddd07cda 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 16ff71e4..b9a68f89 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 e65c5ea9f7ce6fade201ed15b44dcb4d82219b3f Mon Sep 17 00:00:00 2001 1From a2d297031e08f986189761dafdac78a95db39de8 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 bc06d7fa..87854aff 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -3,9 +3,9 @@ require 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 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ 6 file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \
7 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ 7 file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \
8 file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6 \ 8 file://LICENSE.GPLv3;md5=bfdd8aa675169432d6d9b63d056de148 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11" 11"
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
33 33
34SRCREV = "ec575c44637744413b106388cd0ed1d399fc7871" 34SRCREV = "bda7ece99a8162118a91e9f475c149be39846ecd"
35 35
36BBCLASSEXTEND = "native nativesdk" 36BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 0f30e9b6..5e11d24f 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -3,9 +3,9 @@ require qt5-git.inc
3 3
4LICENSE = "(LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 4LICENSE = "(LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
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 = "674d2ca9f7c51f3621c9e2b36c9f02528dd23d40" 117SRCREV = "4925f90e9ceb0b4081649d1fc1eec10beb65f722"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index 6122db41..786271d0 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -4,9 +4,9 @@ require qt5-git.inc
4# There are no LGPLv3-only licensed files in this component. 4# There are no LGPLv3-only licensed files in this component.
5LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 5LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 12"
@@ -25,4 +25,4 @@ do_install() {
25 oe_runmake install INSTALL_ROOT=${D} 25 oe_runmake install INSTALL_ROOT=${D}
26} 26}
27 27
28SRCREV = "d9132f078bb168a9a013b97493c219596cc8c6b2" 28SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd"
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 45493cf5..6c65e2a4 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 cadcacf58301251629a63ecd2682d58e6bf24cb8 Mon Sep 17 00:00:00 2001 1From 58cea434f7b4f0f2469ba6e8eb892a448e20f6a6 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 f39707c6..64027101 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 52971db84e3b2c429e8777953c0532dcb88b8e6b Mon Sep 17 00:00:00 2001 1From 2be2c512d07fb013022c9ccb7d81308295e71866 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
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 63913b57..3153dc06 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -4,9 +4,9 @@ require qt5-git.inc
4# There are no LGPLv3-only licensed files in this component. 4# There are no LGPLv3-only licensed files in this component.
5LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 5LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 12"
@@ -36,4 +36,4 @@ SRC_URI += " \
36 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ 36 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
37" 37"
38 38
39SRCREV = "d9132f078bb168a9a013b97493c219596cc8c6b2" 39SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 7288b0ad..55a1cb92 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -5,14 +5,14 @@ require qt5-git.inc
5# There are no GPLv2 licensed files in this component. 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)" 6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 8 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 9 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
10 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 10 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
11 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 11 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
12 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 12 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
14" 14"
15 15
16DEPENDS += "qtdeclarative qtwebsockets" 16DEPENDS += "qtdeclarative qtwebsockets"
17 17
18SRCREV = "bec50124b893c4632829d9806f49f64c4debf936" 18SRCREV = "3b28a6956cb3cab087481312dc82a907b118e0de"
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 75350c17..28e5540b 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 04be78d20ecc23e289e171e907bb5daf9393619d Mon Sep 17 00:00:00 2001 1From 092e3c94fbec392c6b2f29bc2999595a10d0e66f 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
@@ -6,7 +6,7 @@ Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8--- 8---
9 src/3rdparty/chromium/base/base.gypi | 2 +- 9 chromium/base/base.gypi | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi 12diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi
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 c95fad09..fed7f11f 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 dde0edc1681bb49580584028c2d7b5757e177cd1 Mon Sep 17 00:00:00 2001 1From 8d94528e14cc00934a0beaac53fa990567740596 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,10 +10,10 @@ 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 2df689b..8d984c7 100644 13index a4abf45..47311c6 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@@ -131,9 +131,9 @@ defineReplace(mocOutput) { 16@@ -125,9 +125,9 @@ defineReplace(mocOutput) {
17 out = $$1 17 out = $$1
18 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one 18 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
19 for(ext, $$list($${QMAKE_EXT_CPP})): \ 19 for(ext, $$list($${QMAKE_EXT_CPP})): \
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 00432bc0..ab6dbb69 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 3ae00f0217e4a0039f0855ea6cd945209b1734ee Mon Sep 17 00:00:00 2001 1From eaaf8074a826137d3ad061f4c09bb36f449188a3 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 18f268ce..822aefbe 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 6576e3135b839b53c422befac0a233f6dd1966bf Mon Sep 17 00:00:00 2001 1From 19f7088dd18c4966ec40501cd7e07a0ea16613ae 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,10 +11,10 @@ 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 8d984c7..055e960 100644 14index 47311c6..be2b2a5 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@@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { 17@@ -122,7 +122,8 @@ defineReplace(findIncludedMocFiles) {
18 } 18 }
19 19
20 defineReplace(mocOutput) { 20 defineReplace(mocOutput) {
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 78cb3fc4..609330d6 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 f4c64fbabdcc30d46d9181401aa1c9d78fcb0b2f Mon Sep 17 00:00:00 2001 1From 99e307a75a331e60cb9bcb6d75bc3e0afb8e1b24 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 055e960..379c9b5 100644 15index be2b2a5..fb650c2 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 901462cd..d6069ae5 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 a2670f5ad67822b399e9dd7b3b87589be1da9749 Mon Sep 17 00:00:00 2001 1From dd72b83e84d0c9f8034096ff2db3d826ba708eb6 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 65bf25e..0447d07 100644 12index 0fd187a..54b4b7f 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@@ -56,6 +56,8 @@ 15@@ -56,6 +56,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 fa3faf45..d420c339 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 b523c4dd76f6205389d8f5771124f0451ec7183f Mon Sep 17 00:00:00 2001 1From 149dd23e66b3e0ea64f090478ac974a51e0b6a42 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 a20c0b7f..9682e81a 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -4,9 +4,9 @@ LICENSE = "LGPL-3.0 & BSD"
4LIC_FILES_CHKSUM = " \ 4LIC_FILES_CHKSUM = " \
5 file://src/core/browser_context_qt.cpp;md5=5fe719c44250955a5d5f8fb15fc8b1da;beginline=1;endline=35 \ 5 file://src/core/browser_context_qt.cpp;md5=5fe719c44250955a5d5f8fb15fc8b1da;beginline=1;endline=35 \
6 file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ 6 file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \
7 file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ 7 file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 9 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
10" 10"
11 11
12DEPENDS += " \ 12DEPENDS += " \
@@ -119,8 +119,10 @@ SRC_URI += " \
119 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 119 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
120" 120"
121 121
122SRCREV_qtwebengine = "f531565348e550bc2e03917874009331556f0d66" 122SRCREV_qtwebengine = "808ca6e6917cf17e4c30fcd3ac609164b36594cc"
123SRCREV_chromium = "19e3d1d3af80efee4377a4e5fcb9c214dba5be4e" 123# This is in git submodule, but we're using latest in 45-based
124# SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3"
125SRCREV_chromium = "9d6566ee193e8996fb867cf776dc13f697400f24"
124SRCREV = "${SRCREV_qtwebengine}" 126SRCREV = "${SRCREV_qtwebengine}"
125 127
126SRCREV_FORMAT = "qtwebengine_chromium" 128SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
index 1f3dd2a7..2ed9558d 100644
--- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
@@ -1,4 +1,4 @@
1From 3e321803386278c52508d114f5096883e974a4bb Mon Sep 17 00:00:00 2001 1From 24f843d4b73de923712c40335068f6f32ff65c7c Mon Sep 17 00:00:00 2001
2From: Trevor Woerner <trevor.woerner@linaro.org> 2From: Trevor Woerner <trevor.woerner@linaro.org>
3Date: Fri, 7 Feb 2014 04:07:17 +0100 3Date: Fri, 7 Feb 2014 04:07:17 +0100
4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) 4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
index 2114b42c..ebed7294 100644
--- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
+++ b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
@@ -1,4 +1,4 @@
1From f1eb41ada1a9bb5f4073c8a48010555cbefeec34 Mon Sep 17 00:00:00 2001 1From 63d1bab5741e08b91549a55ff039eeac36e745b8 Mon Sep 17 00:00:00 2001
2From: Magnus Granberg <zorry@gentoo.org> 2From: Magnus Granberg <zorry@gentoo.org>
3Date: Fri, 27 Feb 2015 11:55:09 +0100 3Date: Fri, 27 Feb 2015 11:55:09 +0100
4Subject: [PATCH] Remove TEXTREL tag in x86 4Subject: [PATCH] Remove TEXTREL tag in x86
diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
index 5edc9392..32a05c1b 100644
--- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
+++ b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
@@ -1,4 +1,4 @@
1From 5e5545f49d91e1c40d85d2497e16495ee9e53c11 Mon Sep 17 00:00:00 2001 1From cec1f02bcd1e484fe422e98562a093541c9c9011 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 5 Jun 2015 19:55:05 -0700 3Date: Fri, 5 Jun 2015 19:55:05 -0700
4Subject: [PATCH] Exclude backtrace() API for non-glibc libraries 4Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 753246a2..c71850a1 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -71,4 +71,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
71RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 71RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
72export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 72export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
73 73
74SRCREV = "da5f9d788f96340a44083ed4e28cdf6ea0a393f0" 74SRCREV = "a6c9dd667d534d3342bfba456f9d5c146a924de0"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index f289d26e..04f762ed 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -3,12 +3,12 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 4LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
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=bb426f3367c4805d1e12fad05bd0b750 \ 9 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
10" 10"
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "10cad9ece2cb380e26e03a1c03b900f8e3b4c801" 14SRCREV = "e66dcd51d0e5517e88cd59912fd08501522a2902"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index ce9e4541..eaed56c4 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -3,14 +3,14 @@ require 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 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
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=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "36ae961b08420f14d7ad52ee5dc23ea456accfd9" 16SRCREV = "df10edcfae328f397c99192b322268c9e96f6dab"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 9008d700..e6962a60 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -4,15 +4,15 @@ require qt5-git.inc
4# There are no LGPLv3-only licensed files in this component. 4# There are no LGPLv3-only licensed files in this component.
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 12"
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "64e5f2be2ba63aa1ed04291dc529f2b8edee9a0b" 16SRCREV = "c0b6fbcadbefcc8a91e5db7fd98662dddcd7a0f8"
17 17
18BBCLASSEXTEND =+ "native nativesdk" 18BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-26 01:12:05 +0000