summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb24
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb8
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch34
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch34
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch16
-rw-r--r--recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch (renamed from recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch)10
-rw-r--r--recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch30
-rw-r--r--recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch (renamed from recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch)14
-rw-r--r--recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch (renamed from recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0008-Always-build-uic.patch14
-rw-r--r--recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch68
-rw-r--r--recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch18
-rw-r--r--recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch30
-rw-r--r--recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch49
-rw-r--r--recipes-qt/qt5/qtbase_git.bb36
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb4
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb3
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb4
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb5
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb2
-rw-r--r--recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch18
-rw-r--r--recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch4
-rw-r--r--recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch4
-rw-r--r--recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch4
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb2
-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.bb4
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch38
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch29
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch71
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb9
-rw-r--r--recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch2
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-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.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
63 files changed, 178 insertions, 512 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index e7879934..f712af72 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -26,9 +26,9 @@ SRC_URI += "\
26 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 26 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
27 file://0003-Add-external-hostbindir-option.patch \ 27 file://0003-Add-external-hostbindir-option.patch \
28 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 28 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
29 file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ 29 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
30 file://0006-configure-bump-path-length-from-256-to-512-character.patch \ 30 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
31 file://0007-QOpenGLPaintDevice-sub-area-support.patch \ 31 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
32" 32"
33 33
34# common for qtbase-native and nativesdk-qtbase 34# common for qtbase-native and nativesdk-qtbase
@@ -37,11 +37,6 @@ SRC_URI += " \
37 file://0009-Add-external-hostbindir-option-for-native-sdk.patch \ 37 file://0009-Add-external-hostbindir-option-for-native-sdk.patch \
38" 38"
39 39
40# specific for nativesdk-qtbase
41SRC_URI += " \
42 file://0010-configure-preserve-built-qmake-and-swap-with-native-.patch \
43"
44
45# CMake's toolchain configuration of nativesdk-qtbase 40# CMake's toolchain configuration of nativesdk-qtbase
46SRC_URI += " \ 41SRC_URI += " \
47 file://OEQt5Toolchain.cmake \ 42 file://OEQt5Toolchain.cmake \
@@ -149,10 +144,9 @@ OE_QMAKE_QMAKE = "bin/qmake"
149do_configure() { 144do_configure() {
150 # we need symlink in path relative to source, because 145 # we need symlink in path relative to source, because
151 # EffectivePaths:Prefix is relative to qmake location 146 # EffectivePaths:Prefix is relative to qmake location
152 # Also, configure expects qmake-native to swap with real one 147 if [ ! -e ${B}/bin/qmake ]; then
153 if [ ! -e ${B}/bin/qmake-native ]; then 148 mkdir -p ${B}/bin
154 mkdir ${B}/bin 149 ln -sf ${OE_QMAKE_QMAKE_ORIG} ${B}/bin/qmake
155 ln -sf ${OE_QMAKE_QMAKE_ORIG} ${B}/bin/qmake-native
156 fi 150 fi
157 151
158 ${S}/configure -v \ 152 ${S}/configure -v \
@@ -223,9 +217,7 @@ do_install() {
223 217
224 oe_runmake install INSTALL_ROOT=${D} 218 oe_runmake install INSTALL_ROOT=${D}
225 219
226 # replace the native qmake installed above with nativesdk version 220 install -m 755 ${B}/bin/qmake-target ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake
227 rm -rf ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake
228 install -m 755 ${B}/bin/qmake-real ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake
229 221
230 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) 222 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
231 # e.g. qt3d, qtwayland 223 # e.g. qt3d, qtwayland
@@ -278,4 +270,4 @@ fakeroot do_generate_qt_environment_file() {
278 270
279addtask generate_qt_environment_file after do_install before do_package 271addtask generate_qt_environment_file after do_install before do_package
280 272
281SRCREV = "5afc431323454225363dae30e67a1cb909086bf9" 273SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 437f41c2..0ec99c61 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -15,4 +15,4 @@ FILES_${PN}-qmlplugins += " \
15 ${OE_QMAKE_PATH_QML}/*/*/*.obj \ 15 ${OE_QMAKE_PATH_QML}/*/*/*.obj \
16" 16"
17 17
18SRCREV = "ec963e106397d46e5c853e9adb3fbec1b27d9b04" 18SRCREV = "9b9f34701f47824e8201453d148152fb0855f98a"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index bfe1f859..172a170e 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.5" 5QT_MODULE_BRANCH ?= "5.6"
6 6
7# each module needs to define valid SRCREV 7# each module needs to define valid SRCREV
8SRC_URI = " \ 8SRC_URI = " \
@@ -11,7 +11,7 @@ SRC_URI = " \
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14PV = "5.5.1+git${SRCPV}" 14PV = "5.5.99+5.6.0-alpha1+git${SRCPV}"
15 15
16#LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 16#LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
17#LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 17#LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 10496f08..e27d34bf 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -20,9 +20,9 @@ SRC_URI += "\
20 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 20 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
21 file://0003-Add-external-hostbindir-option.patch \ 21 file://0003-Add-external-hostbindir-option.patch \
22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
23 file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ 23 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
24 file://0006-configure-bump-path-length-from-256-to-512-character.patch \ 24 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
25 file://0007-QOpenGLPaintDevice-sub-area-support.patch \ 25 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
26" 26"
27 27
28# common for qtbase-native and nativesdk-qtbase 28# common for qtbase-native and nativesdk-qtbase
@@ -116,4 +116,4 @@ do_install() {
116 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 116 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
117} 117}
118 118
119SRCREV = "5afc431323454225363dae30e67a1cb909086bf9" 119SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62"
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 a9c448dc..2b8c9d3c 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,7 +1,7 @@
1From 76283f2bca936a7565e8bf38a4630ec98f47ef50 Mon Sep 17 00:00:00 2001 1From 729b7873256b11778832c5786dc50fd9ea860a7d 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 01/10] Add linux-oe-g++ platform 4Subject: [PATCH 1/9] Add linux-oe-g++ platform
5 5
6* This qmake.conf unlike other platforms reads most variables from 6* This qmake.conf unlike other platforms reads most variables from
7 shell environment, because it's easier for qt recipes to export 7 shell environment, because it's easier for qt recipes to export
@@ -37,22 +37,26 @@ Subject: [PATCH 01/10] Add linux-oe-g++ platform
37 /bin/sh: line 0: test: -gt: unary operator expected 37 /bin/sh: line 0: test: -gt: unary operator expected
38 which are not fatal, but still misleading in do_configure output 38 which are not fatal, but still misleading in do_configure output
39 39
40* add -target suffix to qmake built in qtbase configure, this way we can
41 use qmake from qtbase-native, but then include qmake built for target
42 in qtbase-tools package (smilarly for nativesdk-qtbase).
43
40Upstream-Status: Inappropriate [embedded specific] 44Upstream-Status: Inappropriate [embedded specific]
41 too OE specific, probably cannot be upstreamed 45 too OE specific, probably cannot be upstreamed
42 46
43Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c 47Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c
44Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 48Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
45--- 49---
46 configure | 70 +++++++++++++++--------- 50 configure | 71 ++++++++++++++++---------
47 mkspecs/features/configure.prf | 4 +- 51 mkspecs/features/configure.prf | 4 +-
48 mkspecs/linux-oe-g++/qmake.conf | 42 +++++++++++++++ 52 mkspecs/linux-oe-g++/qmake.conf | 42 +++++++++++++++
49 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ 53 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
50 4 files changed, 188 insertions(+), 28 deletions(-) 54 4 files changed, 189 insertions(+), 28 deletions(-)
51 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 55 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
52 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 56 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
53 57
54diff --git a/configure b/configure 58diff --git a/configure b/configure
55index cea62fb..e1929e7 100755 59index 16e8fb4..9897fe6 100755
56--- a/configure 60--- a/configure
57+++ b/configure 61+++ b/configure
58@@ -342,6 +342,16 @@ getQMakeConf() 62@@ -342,6 +342,16 @@ getQMakeConf()
@@ -89,7 +93,7 @@ index cea62fb..e1929e7 100755
89 compilerSupportsFlag() 93 compilerSupportsFlag()
90 { 94 {
91 cat >conftest.cpp <<EOF 95 cat >conftest.cpp <<EOF
92@@ -564,24 +584,14 @@ fi 96@@ -557,24 +577,14 @@ fi
93 # initalize variables 97 # initalize variables
94 #------------------------------------------------------------------------------- 98 #-------------------------------------------------------------------------------
95 99
@@ -120,7 +124,7 @@ index cea62fb..e1929e7 100755
120 fi'` 124 fi'`
121 eval "$cmd" 125 eval "$cmd"
122 done 126 done
123@@ -3350,7 +3360,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then 127@@ -3400,7 +3410,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
124 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no 128 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
125 fi 129 fi
126 130
@@ -129,7 +133,7 @@ index cea62fb..e1929e7 100755
129 133
130 TEST_COMPILER=$QMAKE_CONF_COMPILER 134 TEST_COMPILER=$QMAKE_CONF_COMPILER
131 135
132@@ -3407,7 +3417,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then 136@@ -3457,7 +3467,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
133 exit 1 137 exit 1
134 fi 138 fi
135 fi 139 fi
@@ -138,7 +142,7 @@ index cea62fb..e1929e7 100755
138 142
139 GCC_MACHINE_DUMP= 143 GCC_MACHINE_DUMP=
140 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac 144 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
141@@ -3909,6 +3919,14 @@ setBootstrapVariable() 145@@ -3958,6 +3968,14 @@ setBootstrapVariable()
142 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" 146 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
143 } 147 }
144 148
@@ -153,7 +157,7 @@ index cea62fb..e1929e7 100755
153 # build qmake 157 # build qmake
154 if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 158 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
155 echo "Creating qmake..." 159 echo "Creating qmake..."
156@@ -3947,14 +3965,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 160@@ -3996,14 +4014,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
157 fi 161 fi
158 162
159 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= 163 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -176,6 +180,14 @@ index cea62fb..e1929e7 100755
176 180
177 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then 181 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
178 setBootstrapVariable QMAKE_CFLAGS_RELEASE 182 setBootstrapVariable QMAKE_CFLAGS_RELEASE
183@@ -4052,6 +4070,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
184 \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \
185 \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\""
186 EXEEXT=
187+ [ "$QT_CROSS_COMPILE" = "yes" ] && EXEEXT=-target
188 fi
189 if [ "$BUILD_ON_MAC" = "yes" ]; then
190 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile"
179diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 191diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
180index 6b37a04..dcf6025 100644 192index 6b37a04..dcf6025 100644
181--- a/mkspecs/features/configure.prf 193--- a/mkspecs/features/configure.prf
@@ -350,5 +362,5 @@ index 0000000..dd12003
350+ 362+
351+#endif // QPLATFORMDEFS_H 363+#endif // QPLATFORMDEFS_H
352-- 364--
3532.6.1 3652.6.2
354 366
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index c5f14c9d..01832386 100644
--- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,8 +1,8 @@
1From f15c77264cc3ee82cba4127e58be4f6401b791f6 Mon Sep 17 00:00:00 2001 1From f902b73eda6d459a3669fd78a3c8908ae13e705b Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside 4Subject: [PATCH 2/9] qlibraryinfo: allow to set qt.conf from the outside using
5 using the environment 5 the environment
6 6
7Allow to set a qt.conf from the outside using the environment. This allows 7Allow to set a qt.conf from the outside using the environment. This allows
8to inject new prefixes and other paths into qmake. This is needed when using 8to inject new prefixes and other paths into qmake. This is needed when using
@@ -35,5 +35,5 @@ index 0cfcc4e..c3b5c2d 100644
35 return new QSettings(qtconfig, QSettings::IniFormat); 35 return new QSettings(qtconfig, QSettings::IniFormat);
36 #ifdef QT_BUILD_QMAKE 36 #ifdef QT_BUILD_QMAKE
37-- 37--
382.6.1 382.6.2
39 39
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
index e969f6fa..ea152790 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
1From 9529fdce0bd5516f86de1cb18aa6d18a66317ba5 Mon Sep 17 00:00:00 2001 1From 175d86ddb36117c0ca2ff47ae42693980dbfa098 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 03/10] Add -external-hostbindir option 4Subject: [PATCH 3/9] Add -external-hostbindir option
5 5
6* when cross-compiling it's sometimes useful to use existing tools from machine 6* when cross-compiling it's sometimes useful to use existing tools from machine
7 (or in OpenEmbedded built with separate native recipe) when building for target 7 (or in OpenEmbedded built with separate native recipe) when building for target
@@ -29,18 +29,18 @@ Conflicts:
29--- 29---
30 configure | 14 ++++++++++++++ 30 configure | 14 ++++++++++++++
31 mkspecs/features/qt_functions.prf | 6 +++++- 31 mkspecs/features/qt_functions.prf | 6 +++++-
32 mkspecs/features/qt_tool.prf | 4 ++-- 32 mkspecs/features/qt_tool.prf | 5 +++--
33 qtbase.pro | 13 ++++++++++--- 33 qtbase.pro | 13 ++++++++++---
34 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- 34 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
35 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- 35 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
36 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- 36 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
37 7 files changed, 37 insertions(+), 12 deletions(-) 37 7 files changed, 38 insertions(+), 12 deletions(-)
38 38
39diff --git a/configure b/configure 39diff --git a/configure b/configure
40index e1929e7..a757ce5 100755 40index 9897fe6..aa89d30 100755
41--- a/configure 41--- a/configure
42+++ b/configure 42+++ b/configure
43@@ -809,6 +809,7 @@ QT_HOST_BINS= 43@@ -808,6 +808,7 @@ QT_HOST_BINS=
44 QT_HOST_LIBS= 44 QT_HOST_LIBS=
45 QT_HOST_DATA= 45 QT_HOST_DATA=
46 QT_EXT_PREFIX= 46 QT_EXT_PREFIX=
@@ -48,7 +48,7 @@ index e1929e7..a757ce5 100755
48 48
49 #flags for SQL drivers 49 #flags for SQL drivers
50 QT_CFLAGS_PSQL= 50 QT_CFLAGS_PSQL=
51@@ -928,6 +929,7 @@ while [ "$#" -gt 0 ]; do 51@@ -927,6 +928,7 @@ while [ "$#" -gt 0 ]; do
52 -testsdir| \ 52 -testsdir| \
53 -hostdatadir| \ 53 -hostdatadir| \
54 -hostbindir| \ 54 -hostbindir| \
@@ -66,7 +66,7 @@ index e1929e7..a757ce5 100755
66 pkg-config) 66 pkg-config)
67 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 67 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
68 CFG_PKGCONFIG="$VAL" 68 CFG_PKGCONFIG="$VAL"
69@@ -2383,6 +2388,10 @@ Installation options: 69@@ -2419,6 +2424,10 @@ Installation options:
70 -hostdatadir <dir> . Data used by qmake will be installed to <dir> 70 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
71 (default HOSTPREFIX) 71 (default HOSTPREFIX)
72 72
@@ -77,7 +77,7 @@ index e1929e7..a757ce5 100755
77 Configure options: 77 Configure options:
78 78
79 The defaults (*) are usually acceptable. A plus (+) denotes a default value 79 The defaults (*) are usually acceptable. A plus (+) denotes a default value
80@@ -3110,6 +3119,11 @@ fi 80@@ -3158,6 +3167,11 @@ fi
81 # command line and environment validation 81 # command line and environment validation
82 #------------------------------------------------------------------------------- 82 #-------------------------------------------------------------------------------
83 83
@@ -90,10 +90,10 @@ index e1929e7..a757ce5 100755
90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h 90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
91 case "$CFG_QCONFIG" in 91 case "$CFG_QCONFIG" in
92diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 92diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
93index a1c4996..fca679c 100644 93index 6616aa4..3d40bf9 100644
94--- a/mkspecs/features/qt_functions.prf 94--- a/mkspecs/features/qt_functions.prf
95+++ b/mkspecs/features/qt_functions.prf 95+++ b/mkspecs/features/qt_functions.prf
96@@ -198,7 +198,11 @@ defineTest(qtAddRpathLink) { 96@@ -57,7 +57,11 @@ defineTest(qtHaveModule) {
97 defineTest(qtPrepareTool) { 97 defineTest(qtPrepareTool) {
98 cmd = $$eval(QT_TOOL.$${2}.binary) 98 cmd = $$eval(QT_TOOL.$${2}.binary)
99 isEmpty(cmd) { 99 isEmpty(cmd) {
@@ -107,15 +107,15 @@ index a1c4996..fca679c 100644
107 cmd = perl -w $$system_path($${cmd}.pl) 107 cmd = perl -w $$system_path($${cmd}.pl)
108 } else: contains(QMAKE_HOST.os, Windows) { 108 } else: contains(QMAKE_HOST.os, Windows) {
109diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf 109diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
110index 1d3e88c..9b26adf 100644 110index 3f0301a..7dc66de 100644
111--- a/mkspecs/features/qt_tool.prf 111--- a/mkspecs/features/qt_tool.prf
112+++ b/mkspecs/features/qt_tool.prf 112+++ b/mkspecs/features/qt_tool.prf
113@@ -12,11 +12,11 @@ 113@@ -14,10 +14,11 @@ load(qt_app)
114 load(qt_app)
115
116 CONFIG += console 114 CONFIG += console
117+QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS] 115 DEFINES *= QT_USE_QSTRINGBUILDER
118 116
117+QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS]
118+
119 # If we are doing a prefix build, create a "module" pri which enables 119 # If we are doing a prefix build, create a "module" pri which enables
120 # qtPrepareTool() to work with the non-installed build. 120 # qtPrepareTool() to work with the non-installed build.
121-# Non-bootstrapped tools always need this because of the environment setup. 121-# Non-bootstrapped tools always need this because of the environment setup.
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644
225 _qt5_Widgets_check_file_exists(${imported_location}) 225 _qt5_Widgets_check_file_exists(${imported_location})
226 226
227-- 227--
2282.6.1 2282.6.2
229 229
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 b2cf522b..2bbb92cc 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,7 +1,7 @@
1From b6d708efc205f2ffc0280e2da94596384bd98049 Mon Sep 17 00:00:00 2001 1From a76a6c33be512a2909904b6136a6044e4b747ffd 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 04/10] qt_module: Fix pkgconfig and libtool replacements 4Subject: [PATCH 4/9] qt_module: Fix pkgconfig and libtool replacements
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -67,10 +67,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
67 2 files changed, 11 insertions(+), 1 deletion(-) 67 2 files changed, 11 insertions(+), 1 deletion(-)
68 68
69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
70index 55f65b5..2412fdd 100644 70index 38602f6..f9c401f 100644
71--- a/mkspecs/features/qt_common.prf 71--- a/mkspecs/features/qt_common.prf
72+++ b/mkspecs/features/qt_common.prf 72+++ b/mkspecs/features/qt_common.prf
73@@ -36,7 +36,7 @@ contains(TEMPLATE, .*lib) { 73@@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) {
74 lib_replace.replace = 74 lib_replace.replace =
75 } else { 75 } else {
76 lib_replace.match = $$rplbase/lib 76 lib_replace.match = $$rplbase/lib
@@ -80,10 +80,10 @@ index 55f65b5..2412fdd 100644
80 lib_replace.CONFIG = path 80 lib_replace.CONFIG = path
81 QMAKE_PRL_INSTALL_REPLACE += lib_replace 81 QMAKE_PRL_INSTALL_REPLACE += lib_replace
82diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 82diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
83index c89b6d2..23d4366 100644 83index 193629b..38ff9a8 100644
84--- a/mkspecs/features/qt_module.prf 84--- a/mkspecs/features/qt_module.prf
85+++ b/mkspecs/features/qt_module.prf 85+++ b/mkspecs/features/qt_module.prf
86@@ -214,6 +214,11 @@ unix|mingw { 86@@ -255,6 +255,11 @@ unix|mingw {
87 pclib_replace.CONFIG = path 87 pclib_replace.CONFIG = path
88 QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace 88 QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
89 89
@@ -95,7 +95,7 @@ index c89b6d2..23d4366 100644
95 unix { 95 unix {
96 CONFIG += create_libtool explicitlib 96 CONFIG += create_libtool explicitlib
97 host_build: \ 97 host_build: \
98@@ -225,6 +230,11 @@ unix|mingw { 98@@ -266,6 +271,11 @@ unix|mingw {
99 ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR 99 ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
100 ltlib_replace.CONFIG = path 100 ltlib_replace.CONFIG = path
101 QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace 101 QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
@@ -108,5 +108,5 @@ index c89b6d2..23d4366 100644
108 } 108 }
109 109
110-- 110--
1112.6.1 1112.6.2
112 112
diff --git a/recipes-qt/qt5/qtbase/0006-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 6fd8b2be..a3470f63 100644
--- a/recipes-qt/qt5/qtbase/0006-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,7 +1,7 @@
1From 3c6cdb9c315e8457b8d191c0f1192499e8edc009 Mon Sep 17 00:00:00 2001 1From 9f80241e140b0e22d58aa2ac6ef13a277c38fe9f 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 06/10] configure: bump path length from 256 to 512 characters 4Subject: [PATCH 5/9] configure: bump path length from 256 to 512 characters
5 5
6Increase the path length that gets hardcoded into generated config.cpp file 6Increase the path length that gets hardcoded into generated config.cpp file
7from 256 to 512 characters, as nativesdk path can be quite long. 7from 256 to 512 characters, as nativesdk path can be quite long.
@@ -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 a757ce5..f0f42ab 100755 17index aa89d30..6edfffd 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3863,10 +3863,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ 20@@ -3912,10 +3912,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 */
@@ -32,5 +32,5 @@ index a757ce5..f0f42ab 100755
32 32
33 static const short qt_configure_str_offsets[] = { 33 static const short qt_configure_str_offsets[] = {
34-- 34--
352.6.1 352.6.2
36 36
diff --git a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch
deleted file mode 100644
index 64f29a58..00000000
--- a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 168690a50a5d8bb1068d254532710cec8c93a08f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 19 Mar 2014 18:32:28 +0100
4Subject: [PATCH 05/10] qeglplatformintegration: Undefine CursorShape from X.h
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++
9 1 file changed, 6 insertions(+)
10
11diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
12index 42fbf8c..8950f2d 100644
13--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
14+++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
15@@ -50,6 +50,12 @@
16 #include <qpa/qplatformnativeinterface.h>
17 #include <EGL/egl.h>
18
19+// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/
20+// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */
21+#ifdef CursorShape
22+#undef CursorShape
23+#endif
24+
25 QT_BEGIN_NAMESPACE
26
27 class QEGLPlatformWindow;
28--
292.6.1
30
diff --git a/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
index 28ecfd50..0dbee0b4 100644
--- a/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,7 +1,7 @@
1From d68aa317015ca452b7097b267e5a1fa576aaa5e8 Mon Sep 17 00:00:00 2001 1From 4772fd9332b7c71543d058c1e1cfa24399a9f269 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 07/10] QOpenGLPaintDevice sub-area support 4Subject: [PATCH 6/9] QOpenGLPaintDevice sub-area support
5 5
6Allows creating QOpenGLPaintDevice targetting sub-area 6Allows creating QOpenGLPaintDevice targetting sub-area
7of binded framebuffer. 7of binded framebuffer.
@@ -21,7 +21,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
21 6 files changed, 23 insertions(+), 3 deletions(-) 21 6 files changed, 23 insertions(+), 3 deletions(-)
22 22
23diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp 23diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
24index c0657fe..395ec14 100644 24index 17a3277..85425da 100644
25--- a/src/gui/opengl/qopenglpaintdevice.cpp 25--- a/src/gui/opengl/qopenglpaintdevice.cpp
26+++ b/src/gui/opengl/qopenglpaintdevice.cpp 26+++ b/src/gui/opengl/qopenglpaintdevice.cpp
27@@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) 27@@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height)
@@ -37,7 +37,7 @@ index c0657fe..395ec14 100644
37 /*! 37 /*!
38 \internal 38 \internal
39 */ 39 */
40@@ -212,6 +218,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const 40@@ -216,6 +222,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const
41 return d_ptr->ctx; 41 return d_ptr->ctx;
42 } 42 }
43 43
@@ -69,7 +69,7 @@ index 804e485..88b481a 100644
69 void setSize(const QSize &size); 69 void setSize(const QSize &size);
70 void setDevicePixelRatio(qreal devicePixelRatio); 70 void setDevicePixelRatio(qreal devicePixelRatio);
71diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h 71diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h
72index 57d93ee..5b5c0d9 100644 72index 54ea092..f660143 100644
73--- a/src/gui/opengl/qopenglpaintdevice_p.h 73--- a/src/gui/opengl/qopenglpaintdevice_p.h
74+++ b/src/gui/opengl/qopenglpaintdevice_p.h 74+++ b/src/gui/opengl/qopenglpaintdevice_p.h
75@@ -65,6 +65,7 @@ public: 75@@ -65,6 +65,7 @@ public:
@@ -81,7 +81,7 @@ index 57d93ee..5b5c0d9 100644
81 81
82 qreal dpmx; 82 qreal dpmx;
83diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp 83diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
84index a9a4ada..de3c518 100644 84index 4836dde..3f99b16 100644
85--- a/src/gui/opengl/qopenglpaintengine.cpp 85--- a/src/gui/opengl/qopenglpaintengine.cpp
86+++ b/src/gui/opengl/qopenglpaintengine.cpp 86+++ b/src/gui/opengl/qopenglpaintengine.cpp
87@@ -2091,7 +2091,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) 87@@ -2091,7 +2091,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
@@ -153,5 +153,5 @@ index c179143..fad68d5 100644
153 } else { 153 } else {
154 if (m_vao.isCreated()) { 154 if (m_vao.isCreated()) {
155-- 155--
1562.6.1 1562.6.2
157 157
diff --git a/recipes-qt/qt5/qtbase/0009-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 26503373..55f82765 100644
--- a/recipes-qt/qt5/qtbase/0009-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,7 +1,7 @@
1From 8ed228de093947c176cd1d8984a61e3b338bbe66 Mon Sep 17 00:00:00 2001 1From a3c5659464c911c60f31834187f3b1e914f0bf1f 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 09/10] linux-oe-g++: Invert conditional for defining 4Subject: [PATCH 7/9] linux-oe-g++: Invert conditional for defining
5 QT_SOCKLEN_T 5 QT_SOCKLEN_T
6 6
7This helps to make sure that QT_SOCKLEN_T is defined to be 'int' 7This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
@@ -32,5 +32,5 @@ index dd12003..8623651 100644
32 32
33 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) 33 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
34-- 34--
352.6.1 352.6.2
36 36
diff --git a/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch
index b2a478dc..359be5fb 100644
--- a/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch
@@ -1,7 +1,7 @@
1From cbd61cc5f4c447a9539e0a6a1dd378ac34471aff Mon Sep 17 00:00:00 2001 1From e3ce176f43e9214808cbdac13ace0aa8d8ec046d 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 08/10] Always build uic 4Subject: [PATCH 8/9] Always build uic
5 5
6Even if we are not building gui or widgets. This tool is needed later 6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target. 7as a native tool when compiling the target.
@@ -14,18 +14,18 @@ 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 61e5ce2..a4047aa 100644 17index a970391..66c66d0 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -182,7 +182,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent 20@@ -176,7 +176,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 } 21 }
22 } 22 }
23 } 23 }
24-SUBDIRS += src_plugins src_tools_qdoc 24-SUBDIRS += src_plugins
25+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic 25+SUBDIRS += src_plugins src_tools_uic
26 26
27 nacl: SUBDIRS -= src_network src_testlib 27 nacl: SUBDIRS -= src_network src_testlib
28 28
29-- 29--
302.6.1 302.6.2
31 31
diff --git a/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
deleted file mode 100644
index 3ba66415..00000000
--- a/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From 3442aad5295956c1a177bdf7ab73e1f0d86ab5fc Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 08/10] qmake: don't build it in configure, but allow to build
5 it separately
6
7* it is already built in qtbase-native, so we don't need it in configure
8* allow building a separate qmake for the target
9
10Upstream-Status: Inappropriate [configuration]
11 OE specific for native/target builds
12
13Signed-off-by: Yu Ke <ke.yu@intel.com>
14Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
15Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17 configure | 2 +-
18 qmake/qmake.pri | 3 ++-
19 qmake/qmake.pro | 2 ++
20 3 files changed, 5 insertions(+), 2 deletions(-)
21---
22 configure | 2 +-
23 qmake/qmake.pri | 3 ++-
24 qmake/qmake.pro | 1 +
25 3 files changed, 4 insertions(+), 2 deletions(-)
26
27diff --git a/configure b/configure
28index f0f42ab..6f338f3 100755
29--- a/configure
30+++ b/configure
31@@ -3942,7 +3942,7 @@ setBootstrapEvalVariable()
32
33
34 # build qmake
35-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
36+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
37 echo "Creating qmake..."
38
39 mkdir -p "$outpath/qmake" || exit
40diff --git a/qmake/qmake.pri b/qmake/qmake.pri
41index 782151d..4b314a8 100644
42--- a/qmake/qmake.pri
43+++ b/qmake/qmake.pri
44@@ -80,7 +80,8 @@ bootstrap { #Qt code
45 qjsonparser.cpp \
46 qjsonarray.cpp \
47 qjsonobject.cpp \
48- qjsonvalue.cpp
49+ qjsonvalue.cpp \
50+ qdebug.cpp
51
52 HEADERS+= \
53 qbitarray.h \
54diff --git a/qmake/qmake.pro b/qmake/qmake.pro
55index 89d6ea5..0ff4a96 100644
56--- a/qmake/qmake.pro
57+++ b/qmake/qmake.pro
58@@ -8,6 +8,7 @@ CONFIG -= qt
59 DEFINES += \
60 QT_BUILD_QMAKE \
61 PROEVALUATOR_FULL
62+TARGET = qmake
63
64 VPATH += \
65 ../src/corelib/global \
66--
672.6.1
68
diff --git a/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch
index 683cf271..4d654a44 100644
--- a/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch
+++ b/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch
@@ -1,7 +1,7 @@
1From 12d06b2c5857a1c9cac4c964f32a582d029e9dfa Mon Sep 17 00:00:00 2001 1From 38ecbe7300925d440fa3d7c58e40ed5a53b2d73a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 09/10] Add -external-hostbindir option for native(sdk) 4Subject: [PATCH 9/9] Add -external-hostbindir option for native(sdk)
5 5
6* when cross-compiling it's sometimes useful to use existing tools from machine 6* when cross-compiling it's sometimes useful to use existing tools from machine
7 (or in OpenEmbedded built with separate native recipe) when building for target 7 (or in OpenEmbedded built with separate native recipe) when building for target
@@ -37,10 +37,10 @@ Conflicts:
37 5 files changed, 16 insertions(+), 1 deletion(-) 37 5 files changed, 16 insertions(+), 1 deletion(-)
38 38
39diff --git a/configure b/configure 39diff --git a/configure b/configure
40index f0f42ab..04fd1ba 100755 40index 6edfffd..313d921 100755
41--- a/configure 41--- a/configure
42+++ b/configure 42+++ b/configure
43@@ -3846,6 +3846,7 @@ addConfStr "$CFG_SYSROOT" 43@@ -3895,6 +3895,7 @@ addConfStr "$CFG_SYSROOT"
44 addConfStr "$QT_REL_HOST_BINS" 44 addConfStr "$QT_REL_HOST_BINS"
45 addConfStr "$QT_REL_HOST_LIBS" 45 addConfStr "$QT_REL_HOST_LIBS"
46 addConfStr "$QT_REL_HOST_DATA" 46 addConfStr "$QT_REL_HOST_DATA"
@@ -94,10 +94,10 @@ index 1ad7637..5a8b127 100644
94 HostSpecPath, 94 HostSpecPath,
95 HostPrefixPath, 95 HostPrefixPath,
96diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 96diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
97index 3bf0546..53bf146 100644 97index 6c3217b..980c578 100644
98--- a/tools/configure/configureapp.cpp 98--- a/tools/configure/configureapp.cpp
99+++ b/tools/configure/configureapp.cpp 99+++ b/tools/configure/configureapp.cpp
100@@ -1217,6 +1217,13 @@ void Configure::parseCmdLine() 100@@ -1243,6 +1243,13 @@ void Configure::parseCmdLine()
101 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); 101 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
102 } 102 }
103 103
@@ -111,7 +111,7 @@ index 3bf0546..53bf146 100644
111 else if (configCmdLine.at(i) == "-make-tool") { 111 else if (configCmdLine.at(i) == "-make-tool") {
112 ++i; 112 ++i;
113 if (i == argCount) 113 if (i == argCount)
114@@ -4101,6 +4108,9 @@ void Configure::generateQConfigCpp() 114@@ -4198,6 +4205,9 @@ void Configure::generateQConfigCpp()
115 115
116 if (dictionary["QT_REL_HOST_DATA"].isEmpty()) 116 if (dictionary["QT_REL_HOST_DATA"].isEmpty())
117 dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; 117 dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"];
@@ -121,7 +121,7 @@ index 3bf0546..53bf146 100644
121 121
122 confStringOff = 0; 122 confStringOff = 0;
123 addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); 123 addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]);
124@@ -4120,6 +4130,7 @@ void Configure::generateQConfigCpp() 124@@ -4217,6 +4227,7 @@ void Configure::generateQConfigCpp()
125 addConfStr(1, dictionary["QT_REL_HOST_BINS"]); 125 addConfStr(1, dictionary["QT_REL_HOST_BINS"]);
126 addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); 126 addConfStr(1, dictionary["QT_REL_HOST_LIBS"]);
127 addConfStr(1, dictionary["QT_REL_HOST_DATA"]); 127 addConfStr(1, dictionary["QT_REL_HOST_DATA"]);
@@ -130,5 +130,5 @@ index 3bf0546..53bf146 100644
130 addConfStr(1, hostSpec); 130 addConfStr(1, hostSpec);
131 131
132-- 132--
1332.6.1 1332.6.2
134 134
diff --git a/recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch
deleted file mode 100644
index 9a8ddbbf..00000000
--- a/recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 706d9a8b270d5eb803e93005cc90a1aa1553572a Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Mon, 11 Nov 2013 20:22:34 -0500
4Subject: [PATCH 10/10] configure: preserve built qmake and swap with native
5 one
6
7Let configure script build the real qmake, but right after it's built, swap
8it with a native qmake for further internal use, preserving the real one.
9
10Signed-off-by: Denys Dmytriyenko <denys@ti.com>
11---
12 configure | 2 ++
13 1 file changed, 2 insertions(+)
14
15diff --git a/configure b/configure
16index 04fd1ba..8914e9c 100755
17--- a/configure
18+++ b/configure
19@@ -4112,6 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
20 echo "Done."
21 fi
22 fi # Build qmake
23+mv "$outpath/bin/qmake" "$outpath/bin/qmake-real"
24+mv "$outpath/bin/qmake-native" "$outpath/bin/qmake"
25
26 echo "Running configuration tests..."
27
28--
292.5.3
30
diff --git a/recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch b/recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch
deleted file mode 100644
index b2dbbfd7..00000000
--- a/recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From c09e6ef0bf6a879455ffee496c716a0bc1787cdf Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Sat, 12 Sep 2015 12:58:46 +0200
4Subject: [PATCH 10/10] qeglplatformscreen.cpp: reorder headers to fix build
5 with egl enabled
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10fixes:
11In file included from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/X11/Xlib.h:44:0,
12 from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/eglvivante.h:244,
13 from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/eglplatform.h:38,
14 from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/egl.h:39,
15 from /home/superandy/tmp/oe-core-glibc/work/cortexa9t2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.0+gitAUTOINC+2fde9f59ee-r0/git/src/platformsupport/eglconvenience/qeglplatformscreen_p.h:52,
16 from /home/superandy/tmp/oe-core-glibc/work/cortexa9t2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.0+gitAUTOINC+2fde9f59ee-r0/git/src/platformsupport/eglconvenience/qeglplatformscreen.cpp:34:
17../../include/QtCore/../../../git/src/corelib/io/qurl.h:131:9: error: expected identifier before numeric constant
18 None = 0x0,
19 ^
20
21This patch has a very limited lifetime: In branch dev and 5.6 the patched file is gone. Therefore:
22
23Upstream-Status: Pending
24
25Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
26---
27 src/platformsupport/eglconvenience/qeglplatformscreen.cpp | 4 ++--
28 1 file changed, 2 insertions(+), 2 deletions(-)
29
30diff --git a/src/platformsupport/eglconvenience/qeglplatformscreen.cpp b/src/platformsupport/eglconvenience/qeglplatformscreen.cpp
31index 61f8cdd..ceec797 100644
32--- a/src/platformsupport/eglconvenience/qeglplatformscreen.cpp
33+++ b/src/platformsupport/eglconvenience/qeglplatformscreen.cpp
34@@ -31,10 +31,10 @@
35 **
36 ****************************************************************************/
37
38-#include "qeglplatformscreen_p.h"
39-#include "qeglplatformwindow_p.h"
40 #include <QtGui/qwindow.h>
41 #include <qpa/qwindowsysteminterface.h>
42+#include "qeglplatformscreen_p.h"
43+#include "qeglplatformwindow_p.h"
44 #include <QtPlatformSupport/private/qopenglcompositor_p.h>
45
46 QT_BEGIN_NAMESPACE
47--
482.5.3
49
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 0ba8ac89..fdc73e1d 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -16,16 +16,9 @@ SRC_URI += "\
16 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 16 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
17 file://0003-Add-external-hostbindir-option.patch \ 17 file://0003-Add-external-hostbindir-option.patch \
18 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 18 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
19 file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ 19 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
20 file://0006-configure-bump-path-length-from-256-to-512-character.patch \ 20 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
21 file://0007-QOpenGLPaintDevice-sub-area-support.patch \ 21 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
22"
23
24# specific for target qtbase
25SRC_URI += "\
26 file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
27 file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
28 file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \
29" 22"
30 23
31DEPENDS += "qtbase-native" 24DEPENDS += "qtbase-native"
@@ -207,21 +200,8 @@ do_configure() {
207 qmake5_base_do_configure 200 qmake5_base_do_configure
208} 201}
209 202
210do_compile_append() {
211 # copy corelib/3rdparty/qmake sources required by qmake -> ${B}
212 cp -ra ${S}/src/corelib ${B}/src
213 cp -ra ${S}/src/3rdparty ${B}/src
214 cp -ra ${S}/qmake ${B}
215 cp ${S}/.qmake.conf ${B}/qmake
216 cd ${B}/qmake
217 # align qt5 tools source path to ${S}
218 sed -i 's:\.\./tools:${S}/tools:g' qmake.pro
219 ../${OE_QMAKE_QMAKE}
220 oe_runmake CC="${CC}" CXX="${CXX}"
221}
222
223do_install_append() { 203do_install_append() {
224 install -m 0755 ${B}/qmake/bin/qmake ${D}/${bindir}${QT_DIR_NAME} 204 install -m 0755 ${B}/bin/qmake-target ${D}/${bindir}${QT_DIR_NAME}/qmake
225 205
226 ### Fix up the binaries to the right location 206 ### Fix up the binaries to the right location
227 ### TODO: FIX 207 ### TODO: FIX
@@ -240,9 +220,9 @@ do_install_append() {
240 rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang 220 rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang
241 221
242 # Replace host paths with qmake built-in properties 222 # Replace host paths with qmake built-in properties
243 sed -i -e 's| ${STAGING_DIR_NATIVE}${prefix_native}| $$[QT_HOST_PREFIX]|g' \ 223# sed -i -e 's| ${STAGING_DIR_NATIVE}${prefix_native}| $$[QT_HOST_PREFIX]|g' \
244 -e 's| ${STAGING_DIR_HOST}| $$[QT_SYSROOT]|g' \ 224# -e 's| ${STAGING_DIR_HOST}| $$[QT_SYSROOT]|g' \
245 ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/qconfig.pri 225# ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/qconfig.pri
246} 226}
247 227
248PACKAGES =. " \ 228PACKAGES =. " \
@@ -279,4 +259,4 @@ sysroot_stage_dirs_append() {
279 rm -rf $to${OE_QMAKE_PATH_QT_FONTS} 259 rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
280} 260}
281 261
282SRCREV = "5afc431323454225363dae30e67a1cb909086bf9" 262SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 9678a608..c892d9b3 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -5,9 +5,9 @@ LICENSE = "LGPL-3.0 | GPL-3.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 6 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
7 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 7 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
8 file://LICENSE.GPL;md5=05832301944453ec79e40ba3c3cfceec \ 8 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
9" 9"
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "9a714258f32a6a5318eb461903af25f64b7c80d2" 13SRCREV = "a84dad27182ba6cb4c6f9bf4008a9e63346a7a83"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 84360e85..b1e155e2 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -22,4 +22,4 @@ do_configure_prepend() {
22 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 22 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
23} 23}
24 24
25SRCREV = "cf8b244f94fdabf5c960d82c4bbcbf13c91c29b1" 25SRCREV = "a7617f963c1d375fb7ac7d5c17f450acdb2796b8"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
index 1a4b5c56..fd2586ea 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 54fca19532b5224e8f79d7a010f2654ee196d326 Mon Sep 17 00:00:00 2001 1From d5e0c3af853c7bdb202f15a12117db76f744cc55 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
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 5ea53239..de71c39b 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -33,6 +33,6 @@ do_configure_prepend() {
33 33
34EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 34EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
35 35
36SRCREV = "3e9f61f305dc4c988e6f2718df56df80f639734e" 36SRCREV = "1064d5100f4d00af5f56b87331251f97d78f8b87"
37 37
38BBCLASSEXTEND =+ "native nativesdk" 38BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 47f2a1d1..5854abe3 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -11,5 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 12DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
13 13
14QT_MODULE_BRANCH = "1.2" 14SRCREV = "34d66f3836051dca35a854577fe04b45af3630f2"
15SRCREV = "e32bcb7b714454f9167c4d49776a95c9a5799d70"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index e707dee2..463e15be 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = "" 18RDEPENDS_${PN}-dev = ""
19 19
20SRCREV = "9aa0edc6d13d20796feb1712883eddb7cd411ecd" 20SRCREV = "ad227e9808288b12726114365ae1474386c6cdf8"
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 4d0402f6..a1124397 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 464c01a76acdde344248a873f63c5016d0258a31 Mon Sep 17 00:00:00 2001 1From 903682bb95cc2cdb51a1155c3977d0ec8619a73d 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 85a1dce6..a847fb28 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ 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=05832301944453ec79e40ba3c3cfceec \
12" 12"
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_
28EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" 28EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
30 30
31SRCREV = "3c68f26c052b06da9b43bb775cbe5a539fccb0c3" 31SRCREV = "67cbcf399aa1a18b9b1dbac0a6572a865687230a"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 63642aa5..2c66ad47 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,4 +29,4 @@ do_configure_prepend() {
29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31 31
32SRCREV = "63b118c7da215d994e1695797fd44c2ad35298c3" 32SRCREV = "1fd85dd9426b65198b396c686edd42e42d5b8149"
diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
index d4601d72..696f1c00 100644
--- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
+++ b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
@@ -1,4 +1,4 @@
1From 64ad5e10c41e234151d18e71bfa315c7906eba16 Mon Sep 17 00:00:00 2001 1From 066a997479b2431d7bc479655ce37ae083e7a224 Mon Sep 17 00:00:00 2001
2From: Yoann Lopes <yoann.lopes@digia.com> 2From: Yoann Lopes <yoann.lopes@digia.com>
3Date: Thu, 31 Oct 2013 15:06:30 +0100 3Date: Thu, 31 Oct 2013 15:06:30 +0100
4Subject: [PATCH] Initial porting effort to GStreamer 1.0. 4Subject: [PATCH] Initial porting effort to GStreamer 1.0.
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index faf05d4e..96a21cd8 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -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 = "0cf41ef53f7b336509ed7d1ae6518655276af70f" 38SRCREV = "ac1b772ec8e428acd23322a6fccbde2bda6b8bd2"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index edd47f64..d7cf4345 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -7,8 +7,7 @@ require qt5-git.inc
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=58a180e1cf84c756c29f782b3a485c29 \
10 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 10 file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
11 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
12 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
14 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 13 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
@@ -24,4 +23,4 @@ do_configure_prepend() {
24 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro 23 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro
25} 24}
26 25
27SRCREV = "f079636a3ee5538eb79fd4e7e6ffcb0465a015a0" 26SRCREV = "b0382acf65dbc0debcb7cf956ba954117a682d90"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 54de87c7..644b70ec 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -13,4 +13,4 @@ DEPENDS += "qtdeclarative"
13 13
14RDEPENDS_${PN}-dev = "" 14RDEPENDS_${PN}-dev = ""
15 15
16SRCREV = "61889f06fa828b483513b8315b4f0870532ece66" 16SRCREV = "2e48d16e4a230069884ac0585ae111037f4171fb"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index b07675fe..c6dca51b 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -26,4 +26,4 @@ ARM_INSTRUCTION_SET = "arm"
26 26
27DEPENDS += "qtbase" 27DEPENDS += "qtbase"
28 28
29SRCREV = "50446e4edb0360871309a5d72a9a873f45fb17bd" 29SRCREV = "7ebf02ea3e8e91b13eb2d34847c005d8a487e9da"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index e495c5b7..a422544b 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase qtdeclarative" 16DEPENDS += "qtbase qtdeclarative"
17 17
18SRCREV = "6a16281aceedb713676e16c3074e6f7ea1e70b79" 18SRCREV = "d8d4a5e9ac1251e82d1ec639bc3bff7e7f53c083"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 53e6069f..c95844c5 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "ad108e9d56e7838eac3726e0492a246086d53e70" 18SRCREV = "2575d33fab4042baba67384f92119c58c0ce0245"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index dc0bd5fe..b3bc50f6 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "b5d689eaafd1e243d38f4df30f2d35eaab8b3b44" 16SRCREV = "9ee5ee12a7b92a57624dafed935b3ac1fad426d9"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 7e36e800..27d2bff3 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -28,6 +28,6 @@ do_install_append() {
28QT_MODULE_BRANCH = "dev" 28QT_MODULE_BRANCH = "dev"
29 29
30# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 30# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
31# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.5 31# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6
32 32
33SRCREV = "0577ffca58b7fed78c1820fc1c2b7ab3533d5698" 33SRCREV = "0577ffca58b7fed78c1820fc1c2b7ab3533d5698"
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 e1255d8b..e743a352 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 922931781bd4fd765de996f1709aff95b6ac3fba Mon Sep 17 00:00:00 2001 1From 0fb675dfdff64a270b92d768bedc0d6b355675b4 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 1/4] Allow to build only lrelease + lupdate + lconvert 4Subject: [PATCH 1/4] Allow to build only lrelease + lupdate + lconvert
@@ -14,9 +14,9 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 examples/examples.pro | 3 ++- 14 examples/examples.pro | 3 ++-
15 src/designer/src/src.pro | 18 ++++++++++-------- 15 src/designer/src/src.pro | 18 ++++++++++--------
16 src/linguist/linguist.pro | 2 +- 16 src/linguist/linguist.pro | 2 +-
17 src/src.pro | 14 ++++++++------ 17 src/src.pro | 16 +++++++++-------
18 tests/auto/auto.pro | 24 +++++++++++++----------- 18 tests/auto/auto.pro | 24 +++++++++++++-----------
19 5 files changed, 34 insertions(+), 27 deletions(-) 19 5 files changed, 35 insertions(+), 28 deletions(-)
20 20
21diff --git a/examples/examples.pro b/examples/examples.pro 21diff --git a/examples/examples.pro b/examples/examples.pro
22index 69365d1..da7b38b 100644 22index 69365d1..da7b38b 100644
@@ -79,10 +79,10 @@ index 3a70580..a977878 100644
79 qtNomakeTools( \ 79 qtNomakeTools( \
80 linguist \ 80 linguist \
81diff --git a/src/src.pro b/src/src.pro 81diff --git a/src/src.pro b/src/src.pro
82index 494898f..c02848d 100644 82index 387d54f..56b7d0c 100644
83--- a/src/src.pro 83--- a/src/src.pro
84+++ b/src/src.pro 84+++ b/src/src.pro
85@@ -4,10 +4,12 @@ qtHaveModule(widgets) { 85@@ -4,19 +4,21 @@ qtHaveModule(widgets) {
86 no-png { 86 no-png {
87 message("Some graphics-related tools are unavailable without PNG support") 87 message("Some graphics-related tools are unavailable without PNG support")
88 } else { 88 } else {
@@ -98,16 +98,18 @@ index 494898f..c02848d 100644
98 98
99 linguist.depends = designer 99 linguist.depends = designer
100 } 100 }
101@@ -15,7 +17,7 @@ qtHaveModule(widgets) { 101 }
102 102
103 SUBDIRS += linguist \ 103 SUBDIRS += linguist \
104- qdoc \
104 qtplugininfo 105 qtplugininfo
105-if(!android|android_app):!ios: SUBDIRS += qtpaths 106-if(!android|android_app):!ios: SUBDIRS += qtpaths
107+!linguistonly: SUBDIRS += qdoc
106+if(!android|android_app):!ios:!linguistonly: SUBDIRS += qtpaths 108+if(!android|android_app):!ios:!linguistonly: SUBDIRS += qtpaths
107 109
108 mac { 110 mac {
109 SUBDIRS += macdeployqt 111 SUBDIRS += macdeployqt
110@@ -25,11 +27,11 @@ android { 112@@ -26,11 +28,11 @@ android {
111 SUBDIRS += androiddeployqt 113 SUBDIRS += androiddeployqt
112 } 114 }
113 115
@@ -155,5 +157,5 @@ index 20b5fec..8a42d1f 100644
155 installed_cmake.depends = cmake 157 installed_cmake.depends = cmake
156 158
157-- 159--
1582.6.1 1602.6.2
159 161
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 3116b3d9..754213fe 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 83493e0f4e0d8b4dbf1da982e4459fefea61c582 Mon Sep 17 00:00:00 2001 1From d480a725a36482f7a1df52c5c170961382a8e730 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 2/4] assistant/help: fix linking of dependent libraries 4Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644
28+ 28+
29+LIBS += -lQt5CLucene 29+LIBS += -lQt5CLucene
30-- 30--
312.6.1 312.6.2
32 32
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
index a0306e5f..3e87400b 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 ad5e4266eda956a1ff408bf3fe875badc5f4c866 Mon Sep 17 00:00:00 2001 1From d26b82742e20d4fff96856f7b9a7828ccb1aea68 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 3/4] add noqtwebkit configuration 4Subject: [PATCH 3/4] add noqtwebkit configuration
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644
47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt 47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget 48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
49-- 49--
502.6.1 502.6.2
51 51
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 ce4a0b7c..55e7ec54 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 e9e9a79d1a58981dd33d18c0f43b1fb982100a61 Mon Sep 17 00:00:00 2001 1From eb882650473cea1cd71cef7813512b381429fd5c 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 4/4] linguist-tools cmake: allow overriding the location for 4Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for
@@ -59,5 +59,5 @@ index 4318b16..2e3b70f 100644
59 59
60 set_target_properties(Qt5::lconvert PROPERTIES 60 set_target_properties(Qt5::lconvert PROPERTIES
61-- 61--
622.6.1 622.6.2
63 63
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index ff95b859..5ee1e865 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -32,6 +32,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
32EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 32EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
33EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" 33EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
34 34
35SRCREV = "02402887562f55b822fd29a64437da3d1252fd5b" 35SRCREV = "57301c0003e9d776d31953f1411cc06a395b752e"
36 36
37BBCLASSEXTEND = "native nativesdk" 37BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 673e25d7..fb584ab6 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -99,4 +99,4 @@ FILES_${PN}-qt = " \
99 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 99 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
100" 100"
101 101
102SRCREV = "6fbc830e0ebeb66a5570e8c432c27658670cd071" 102SRCREV = "9c6d1af76ac28de8d59be344ea3a21b2607fa118"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index b351b384..ba07591a 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -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 = "9d408649458a274864ae2e7c2d67b4fa3cabbfcd" 28SRCREV = "bd21beea9a433a8878c0e719a7bfb8c14df47840"
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 caaceef2..8b539b69 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 7d40a551397f9914cacd5470bf17ac40a7b7330b Mon Sep 17 00:00:00 2001 1From 7c34dff33e7669e9227df548c8ab08a850c72e39 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 384c1fac..27dada21 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 d1de302c09ddbb4baac4bc781a6d53de11f387b3 Mon Sep 17 00:00:00 2001 1From e3469724404a8afaa51939e17fc85f6cb40b5196 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 2ea3285e..98b24e37 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -38,7 +38,7 @@ SRC_URI += " \
38 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ 38 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
39" 39"
40 40
41QT_VERSION ?= "5.5.1" 41QT_VERSION ?= "5.6.0"
42 42
43do_install_append() { 43do_install_append() {
44 # do install files created by qtwaylandscanner 44 # do install files created by qtwaylandscanner
@@ -46,4 +46,4 @@ do_install_append() {
46 install ${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/*protocol*.h ${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private 46 install ${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/*protocol*.h ${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private
47} 47}
48 48
49SRCREV = "9d408649458a274864ae2e7c2d67b4fa3cabbfcd" 49SRCREV = "bd21beea9a433a8878c0e719a7bfb8c14df47840"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index aa7cb254..e070d13d 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtdeclarative qtwebsockets" 16DEPENDS += "qtdeclarative qtwebsockets"
17 17
18SRCREV = "906d910415454d64ff0b021b06f0df422a8c82bd" 18SRCREV = "97577a0f27a1f427948871ae535645a2e0788bf7"
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 062d9ed1..b6500ea0 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,8 +1,8 @@
1From 2a264c2ea7080b026ea1ec85f6317de13c5a6f4f Mon Sep 17 00:00:00 2001 1From 53e16d6f07005c1176455a4488cd8f93218e3cde 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 1/2] <chromium> base.gypi: include 4Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc
5 atomicops_internals_x86_gcc.cc when building for x64 arch 5 when building for x64 arch
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8--- 8---
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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
13index a5a285a..f1cad86 100644 13index b860735..0ed5de3 100644
14--- a/src/3rdparty/chromium/base/base.gypi 14--- a/src/3rdparty/chromium/base/base.gypi
15+++ b/src/3rdparty/chromium/base/base.gypi 15+++ b/src/3rdparty/chromium/base/base.gypi
16@@ -759,7 +759,7 @@ 16@@ -785,7 +785,7 @@
17 ['include', '^nix/'], 17 ['include', '^nix/'],
18 ], 18 ],
19 }], 19 }],
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 02381e04..3249f834 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,7 +1,7 @@
1From cf7f63dfcf71b7baee30112ef73fed67504033f7 Mon Sep 17 00:00:00 2001 1From 38efc016f223a1277bd3a92e4c78ac816adbcdaa 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 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H 4Subject: [PATCH 1/2] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
5 anywhere in path, but at the end 5 anywhere in path, but at the end
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@@ -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 64064bd..8287c8f 100644 13index d5265ab..2825457 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@@ -105,9 +105,9 @@ defineReplace(mocOutput) { 16@@ -113,9 +113,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})): \
@@ -26,5 +26,5 @@ index 64064bd..8287c8f 100644
26 } 26 }
27 27
28-- 28--
292.6.1 292.6.2
30 30
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch
deleted file mode 100644
index ae91cd2f..00000000
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From b534874479a150d1fef4e0a4fb79a176d0a342eb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 27 Jun 2015 13:29:52 -0700
4Subject: [PATCH 2/2] chromium/third_party/boringssl: Demand for newer POSIX
5 macro
6
7Reason for change: Define _POSIX_C_SOURCE such that it demands correct
8posix interfaces, netdb.h declares interfaces such as
9getaddrinfo if __USE_POSIX, i.e. POSIX.1:1990 or later.
10However, these interfaces were new in the 2001 edition of POSIX
11therefore ask for Extension from POSIX.1:2001 since we use addrinfo
12structure here.
13
14Change-Id: Icb1c92745d1a0ca958108ae80c270c630628729e
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16Reviewed-on: https://boringssl-review.googlesource.com/5253
17Reviewed-by: Adam Langley <agl@google.com>
18Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19---
20 src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c b/src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c
24index ba65a1a..66c3976 100644
25--- a/src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c
26+++ b/src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c
27@@ -12,7 +12,7 @@
28 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
29 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
30
31-#define _POSIX_SOURCE
32+#define _POSIX_C_SOURCE 200112L
33
34 #include <openssl/bio.h>
35 #include <openssl/err.h>
36--
372.6.1
38
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 2ba8fec4..4224d322 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,7 +1,7 @@
1From 7f81bad8fcd00afcf2214285856d46f50f91b55c Mon Sep 17 00:00:00 2001 1From ebfec8ca32379bffd18cbab1f4335a458fcc7e41 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 2/4] functions.prf: Make sure we only use the file name to 4Subject: [PATCH 2/2] functions.prf: Make sure we only use the file name to
5 generate it's moc'ed abbreviation 5 generate it's moc'ed abbreviation
6 6
7Signed-off-by: Simon Busch <morphis@gravedo.de> 7Signed-off-by: Simon Busch <morphis@gravedo.de>
@@ -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 8287c8f..04bdba5 100644 14index 2825457..f761b64 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@@ -102,7 +102,8 @@ defineReplace(findIncludedMocFiles) { 17@@ -110,7 +110,8 @@ defineReplace(findIncludedMocFiles) {
18 } 18 }
19 19
20 defineReplace(mocOutput) { 20 defineReplace(mocOutput) {
@@ -25,5 +25,5 @@ index 8287c8f..04bdba5 100644
25 for(ext, $$list($${QMAKE_EXT_CPP})): \ 25 for(ext, $$list($${QMAKE_EXT_CPP})): \
26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) 26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
27-- 27--
282.6.1 282.6.2
29 29
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
deleted file mode 100644
index 23be4890..00000000
--- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From a7bb8e37abb3a11e6257d6e154d33c7af5856dcc Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH 3/4] functions.prf: allow build for linux-oe-g++ platform
5
6Upstream-Status: Inappropriate [OE specific]
7
8Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de>
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 tools/qmake/mkspecs/features/functions.prf | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
15index 04bdba5..4206661 100644
16--- a/tools/qmake/mkspecs/features/functions.prf
17+++ b/tools/qmake/mkspecs/features/functions.prf
18@@ -14,7 +14,7 @@ defineTest(isPlatformSupported) {
19
20 linux-g++*:!isGCCVersionSupported(): return(false)
21 !isPythonVersionSupported(): return(false)
22- linux-g++*|win32-msvc2013|macx-clang*: return(true)
23+ linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang*: return(true)
24 boot2qt: return(true)
25
26 skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
27--
282.6.1
29
diff --git a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch b/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch
deleted file mode 100644
index 037b0e4e..00000000
--- a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From 324eab1b148df1e8330b2dbbd114ab696c163e46 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Mon, 11 May 2015 13:47:06 +0300
4Subject: [PATCH 4/4] Generate usable qmake_extras.gypi
5
6Running qmake recursively does not take .depends into account, so
7the SUBDIRS need to be in correct order so that qmake_extras.gypi
8is used for the ninja files. Do no try to write compiler tools as
9it will break the build.
10
11Task-number: QTBUG-45706
12Upstream-Status: Pending
13---
14 src/core/core.pro | 7 ++++---
15 src/core/gyp_configure_host.pro | 3 ---
16 src/core/gyp_configure_target.pro | 3 ---
17 3 files changed, 4 insertions(+), 9 deletions(-)
18
19diff --git a/src/core/core.pro b/src/core/core.pro
20index cf00f39..747b711 100644
21--- a/src/core/core.pro
22+++ b/src/core/core.pro
23@@ -12,9 +12,7 @@ gyp_run.depends = core_gyp_generator
24 core_module.file = core_module.pro
25 core_module.depends = gyp_run
26
27-SUBDIRS += core_gyp_generator \
28- gyp_run \
29- core_module
30+SUBDIRS += core_gyp_generator
31
32 !win32 {
33 # gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that
34@@ -28,3 +26,6 @@ SUBDIRS += core_gyp_generator \
35 gyp_run.depends += gyp_configure_host gyp_configure_target
36 SUBDIRS += gyp_configure_host gyp_configure_target
37 }
38+
39+SUBDIRS += gyp_run \
40+ core_module
41diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro
42index eb94cb8..859bcbf 100644
43--- a/src/core/gyp_configure_host.pro
44+++ b/src/core/gyp_configure_host.pro
45@@ -6,9 +6,6 @@ option(host_build)
46
47 GYPI_CONTENTS = "{" \
48 " 'make_global_settings': [" \
49- " ['CC.host', '$$which($$QMAKE_CC)']," \
50- " ['CXX.host', '$$which($$QMAKE_CXX)']," \
51- " ['LD.host', '$$which($$QMAKE_LINK)'],"
52
53 GYPI_FILE = $$OUT_PWD/qmake_extras.gypi
54 !build_pass {
55diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro
56index 2a59966..317d24a 100644
57--- a/src/core/gyp_configure_target.pro
58+++ b/src/core/gyp_configure_target.pro
59@@ -3,9 +3,6 @@ TEMPLATE = aux
60
61 TOOLCHAIN_INCLUDES = $${QMAKE_INCDIR_EGL} $${INCLUDEPATH} $${QMAKE_INCDIR}
62
63-GYPI_CONTENTS += " ['CC', '$$which($$QMAKE_CC)']," \
64- " ['CXX', '$$which($$QMAKE_CXX)']," \
65- " ['LD', '$$which($$QMAKE_LINK)'],"
66 GYPI_CONTENTS += " ]," \
67 " 'target_defaults': {" \
68 " 'target_conditions': [" \
69--
702.6.1
71
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index abbca581..9d0d33d0 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -71,19 +71,16 @@ RDEPENDS_${PN}-examples += " \
71 qtdeclarative-qmlplugins \ 71 qtdeclarative-qmlplugins \
72" 72"
73 73
74QT_MODULE_BRANCH_CHROMIUM = "40.0.2214-based" 74QT_MODULE_BRANCH_CHROMIUM = "45-based"
75 75
76SRC_URI += " \ 76SRC_URI += " \
77 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ 77 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
78 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ 78 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
79 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ 79 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
80 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
81 file://0004-Generate-usable-qmake_extras.gypi.patch \
82 file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ 80 file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
83 file://0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch \
84" 81"
85SRCREV_qtwebengine = "ce095e94b686196629244073990530441b9b5f4f" 82SRCREV_qtwebengine = "cfee452174c58fe4048b1604503d03de2764fc8e"
86SRCREV_chromium = "146ebe26dce3289eb440bed7d5d0a7988ff5f5c9" 83SRCREV_chromium = "ec5b3304fc266dfdec7666b8b73d57a3971ea35f"
87SRCREV = "${SRCREV_qtwebengine}" 84SRCREV = "${SRCREV_qtwebengine}"
88 85
89SRCREV_FORMAT = "qtwebengine_chromium" 86SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch b/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch
index eb90a064..3034f950 100644
--- a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch
+++ b/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch
@@ -1,4 +1,4 @@
1From 9097d1fe3b21df880ec799414aeab78e62f032d2 Mon Sep 17 00:00:00 2001 1From 8900f45818b7f181d2b57ceebdf086c78d2ee6b0 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 8 Oct 2013 00:18:10 -0400 3Date: Tue, 8 Oct 2013 00:18:10 -0400
4Subject: [PATCH] qtwebkit-examples: enable building examples by default 4Subject: [PATCH] qtwebkit-examples: enable building examples by default
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 3e89d80c..f9150838 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -21,4 +21,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
21RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 21RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
22RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" 22RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
23 23
24SRCREV = "df729f9f284df2d30db432de351e7e80360097c8" 24SRCREV = "7988aecdbcb07f3a214c2c804a39db3fc5617844"
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 66dfd133..33e7dd28 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 d765da41bafa8349d4c64a74a841ebe3b2fb9443 Mon Sep 17 00:00:00 2001 1From a5aae8adf808bb07b0326edbf2dc66bfb4917963 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 1/3] qtwebkit: fix QA issue (bad RPATH) 4Subject: [PATCH 1/3] 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 3d4ba189..3c3b4893 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 05e0ba998775d92bd3c0701cd5e290815700e3f4 Mon Sep 17 00:00:00 2001 1From 08e983e065acce369aa95e3fcb5b7fe6ca563e04 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 2/3] Remove TEXTREL tag in x86 4Subject: [PATCH 2/3] 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 0351e22f..44650931 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 c9ed11eff6f200ea42ae64372186d560880591bc Mon Sep 17 00:00:00 2001 1From d4ea11922ebaf865f0b0c57e6746d6b985bf840f 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 3/3] Exclude backtrace() API for non-glibc libraries 4Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index b0d1e4ef..862abd28 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -64,4 +64,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
64RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 64RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
65export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 65export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
66 66
67SRCREV = "0d592678bad23a77f35c109253a0263664e69812" 67SRCREV = "93cc8d306f8033551fb60e2e1f8f480330778a21"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 4d0a51fa..6aea0a6f 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "08582917b43af8670658c210b2cb2a8b06e04252" 14SRCREV = "469f748515b65cd4c9bec8794ec37ca6cf5df026"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 5af0ac5f..ac33fb26 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "e4f2f0a146a83fa3160687ca06e11430ff02c5a8" 16SRCREV = "d64ee96f0df4d3baa6959b8552bc59d53cb0b451"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index bea55c41..4b511d0c 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "3338de7bbe76bac44652c525003bc66b14ef16d4" 16SRCREV = "94136d42805abeaf3dd9d6ded7b74e3d27fd3777"
17 17
18BBCLASSEXTEND =+ "native nativesdk" 18BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-20 16:31:59 +0000