summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-01-26 16:54:50 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-01-26 16:18:39 +0100
commit333949a8239dfa7788b35f1059614733e11a6a25 (patch)
tree420843abad8bfc939484fa34bd6f7da9d432db8d /recipes-qt/qt5
parentc0ba8ab590ba4e17a2a04925cf48915233d4f493 (diff)
downloadmeta-qt5-333949a8239dfa7788b35f1059614733e11a6a25.tar.gz
Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. The new Qt configuration system [1] can be used with a new variable EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature arguments. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad. Removes qtdeclarative-render2d [1] https://www.mail-archive.com/development@qt-project.org/msg25257.html Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb93
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch30
-rw-r--r--recipes-qt/qt5/qt3d_git.bb27
-rw-r--r--recipes-qt/qt5/qt5-git.inc6
-rw-r--r--recipes-qt/qt5/qt5.inc4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb31
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch314
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch36
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch154
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch154
-rw-r--r--recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch32
-rw-r--r--recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch18
-rw-r--r--recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch28
-rw-r--r--recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch95
-rw-r--r--recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch131
-rw-r--r--recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch33
-rw-r--r--recipes-qt/qt5/qtbase_git.bb90
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb8
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb11
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative-render2d_git.bb12
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch72
-rw-r--r--recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch25
-rw-r--r--recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch44
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb16
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb3
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb17
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb10
-rw-r--r--recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch28
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb26
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb27
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch56
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb22
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb13
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb4
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb6
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb8
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch28
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb22
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb10
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb10
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb8
-rw-r--r--recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch158
-rw-r--r--recipes-qt/qt5/qttools_git.bb7
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb3
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb32
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch156
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch29
-rw-r--r--recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch27
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb55
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb26
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb8
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb10
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
62 files changed, 381 insertions, 1920 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index dce78fce..7d2ce583 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -27,21 +27,17 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
27# common for qtbase-native, qtbase-nativesdk and qtbase 27# common for qtbase-native, qtbase-nativesdk and qtbase
28SRC_URI += "\ 28SRC_URI += "\
29 file://0001-Add-linux-oe-g-platform.patch \ 29 file://0001-Add-linux-oe-g-platform.patch \
30 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
31 file://0003-Add-external-hostbindir-option.patch \ 30 file://0003-Add-external-hostbindir-option.patch \
32 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 31 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
33 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 32 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
34 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
35 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
36 file://0008-configure-paths-for-target-qmake-properly.patch \ 33 file://0008-configure-paths-for-target-qmake-properly.patch \
37 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \ 34 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
38 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 35 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
39" 36"
40 37
41# common for qtbase-native and nativesdk-qtbase 38# common for qtbase-native and nativesdk-qtbase
42SRC_URI += " \ 39SRC_URI += " \
43 file://0011-Always-build-uic.patch \ 40 file://0011-Always-build-uic.patch \
44 file://0012-Add-external-hostbindir-option-for-native-sdk.patch \
45" 41"
46 42
47# CMake's toolchain configuration of nativesdk-qtbase 43# CMake's toolchain configuration of nativesdk-qtbase
@@ -58,10 +54,11 @@ FILES_${PN}-tools-dev = " \
58 ${FILES_SOLIBSDEV} ${libdir}/*.la \ 54 ${FILES_SOLIBSDEV} ${libdir}/*.la \
59 ${libdir}/*.prl \ 55 ${libdir}/*.prl \
60 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ 56 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \
57 ${OE_QMAKE_PATH_LIBS}/*.prl \
61" 58"
62 59
63FILES_${PN}-tools-staticdev = " \ 60FILES_${PN}-tools-staticdev = " \
64 ${libdir}/libQt5Bootstrap.a \ 61 ${OE_QMAKE_PATH_LIBS}/*.a \
65" 62"
66 63
67FILES_${PN}-tools-dbg = " \ 64FILES_${PN}-tools-dbg = " \
@@ -95,71 +92,10 @@ QT_CONFIG_FLAGS += " \
95OE_QMAKE_PATH_HOST_DATA = "${libdir}${QT_DIR_NAME}" 92OE_QMAKE_PATH_HOST_DATA = "${libdir}${QT_DIR_NAME}"
96OE_QMAKE_PATH_HOST_LIBS = "${libdir}" 93OE_QMAKE_PATH_HOST_LIBS = "${libdir}"
97 94
98do_generate_qt_config_file() {
99 cat > ${QT_CONF_PATH} <<EOF
100[Paths]
101Prefix = ${OE_QMAKE_PATH_PREFIX}
102Headers = ${OE_QMAKE_PATH_HEADERS}
103Libraries = ${OE_QMAKE_PATH_LIBS}
104ArchData = ${OE_QMAKE_PATH_ARCHDATA}
105Data = ${OE_QMAKE_PATH_DATA}
106Binaries = ${OE_QMAKE_PATH_BINS}
107LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
108Plugins = ${OE_QMAKE_PATH_PLUGINS}
109Imports = ${OE_QMAKE_PATH_IMPORTS}
110Qml2Imports = ${OE_QMAKE_PATH_QML}
111Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
112Documentation = ${OE_QMAKE_PATH_DOCS}
113Settings = ${OE_QMAKE_PATH_SETTINGS}
114Examples = ${OE_QMAKE_PATH_EXAMPLES}
115Tests = ${OE_QMAKE_PATH_TESTS}
116HostBinaries = ${OE_QMAKE_PATH_HOST_BINS}
117HostData = ${OE_QMAKE_PATH_HOST_DATA}
118HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS}
119HostSpec = ${OE_QMAKESPEC}
120TartgetSpec = ${OE_XQMAKESPEC}
121ExternalHostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}
122Sysroot =
123EOF
124}
125
126do_generate_qt_config_file_append() {
127 cat >> ${QT_CONF_PATH} <<EOF
128
129[EffectivePaths]
130Prefix=..
131EOF
132}
133
134# qtbase is exception, we need to use mkspecs from ${S}
135QMAKE_MKSPEC_PATH = "${B}"
136
137# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell
138export OE_QMAKE_COMPILER
139export OE_QMAKE_CC
140export OE_QMAKE_CFLAGS
141export OE_QMAKE_CXX
142export OE_QMAKE_CXXFLAGS
143export OE_QMAKE_LINK
144export OE_QMAKE_LDFLAGS
145export OE_QMAKE_AR
146export OE_QMAKE_STRIP
147
148# another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location
149OE_QMAKE_QMAKE_ORIG := "${OE_QMAKE_QMAKE}"
150OE_QMAKE_QMAKE = "bin/qmake"
151
152do_configure() { 95do_configure() {
153 # we need symlink in path relative to source, because
154 # EffectivePaths:Prefix is relative to qmake location
155 if [ ! -e ${B}/bin/qmake ]; then
156 mkdir -p ${B}/bin
157 ln -sf ${OE_QMAKE_QMAKE_ORIG} ${B}/bin/qmake
158 fi
159
160 ${S}/configure -v \ 96 ${S}/configure -v \
161 -opensource -confirm-license \ 97 -opensource -confirm-license \
162 -sysroot ${STAGING_DIR_NATIVE} \ 98 -sysroot ${STAGING_DIR_TARGET} \
163 -no-gcc-sysroot \ 99 -no-gcc-sysroot \
164 -system-zlib \ 100 -system-zlib \
165 -dbus-runtime \ 101 -dbus-runtime \
@@ -193,33 +129,22 @@ do_configure() {
193 -testsdir ${OE_QMAKE_PATH_TESTS} \ 129 -testsdir ${OE_QMAKE_PATH_TESTS} \
194 -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ 130 -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \
195 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ 131 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \
132 -host-option CROSS_COMPILE=${HOST_PREFIX} \
196 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ 133 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
197 -no-glib \ 134 -no-glib \
198 -no-iconv \ 135 -no-iconv \
199 -silent \ 136 -silent \
200 -nomake examples \ 137 -nomake examples \
201 -nomake tests \ 138 -nomake tests \
202 -nomake libs \
203 -no-compile-examples \ 139 -no-compile-examples \
204 -no-rpath \ 140 -no-rpath \
205 -platform ${OE_QMAKESPEC} \ 141 -platform ${OE_QMAKE_PLATFORM_NATIVE} \
206 -xplatform linux-oe-g++ \ 142 -xplatform ${OE_QMAKE_PLATFORM} \
207 ${QT_CONFIG_FLAGS} 143 ${QT_CONFIG_FLAGS}
208
209 bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}"
210} 144}
211 145
212do_install() { 146do_install() {
213 # Fix install paths for all 147 qmake5_base_do_install
214 find . -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
215
216 oe_runmake install INSTALL_ROOT=${D}
217
218 install -m 755 ${B}/bin/qmake-target ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake
219
220 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
221 # e.g. qt3d, qtwayland
222 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
223 148
224 # remove things unused in nativesdk, we need the headers and libs 149 # remove things unused in nativesdk, we need the headers and libs
225 rm -rf ${D}${datadir} \ 150 rm -rf ${D}${datadir} \
@@ -262,4 +187,4 @@ fakeroot do_generate_qt_environment_file() {
262 187
263addtask generate_qt_environment_file after do_install before do_package 188addtask generate_qt_environment_file after do_install before do_package
264 189
265SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd" 190SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980"
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index bb337fde..b19f963e 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,23 +1,24 @@
1From befe1fd63c485b8d10d1b9f1eca3368f3ee0042b Mon Sep 17 00:00:00 2001 1From 64f46f5399627430f9ce1a888fb9212b33977231 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
5 5
6--- 6---
7 qt3d.pro | 7 ++++++- 7 qt3d.pro | 7 ++++++-
8 1 file changed, 6 insertions(+), 1 deletion(-) 8 src/3rdparty/assimp/assimp_dependency.pri | 2 +-
9 2 files changed, 7 insertions(+), 2 deletions(-)
9 10
10diff --git a/qt3d.pro b/qt3d.pro 11diff --git a/qt3d.pro b/qt3d.pro
11index a26e76d..016fb30 100644 12index 2cc347a..81cdeef 100644
12--- a/qt3d.pro 13--- a/qt3d.pro
13+++ b/qt3d.pro 14+++ b/qt3d.pro
14@@ -1,4 +1,4 @@ 15@@ -1,4 +1,4 @@
15-requires(contains(QT_CONFIG, opengl)) 16-requires(qtConfig(opengl))
16+!tools-only:requires(contains(QT_CONFIG, opengl)) 17+!tools-only:requires(qtConfig(opengl))
17 18
18 load(configure) 19 CONFIG += examples_need_tools
19 qtCompileTest(assimp) 20 load(qt_parts)
20@@ -17,3 +17,8 @@ load(qt_parts) 21@@ -14,3 +14,8 @@ load(qt_parts)
21 22
22 OTHER_FILES += \ 23 OTHER_FILES += \
23 sync.profile 24 sync.profile
@@ -26,3 +27,14 @@ index a26e76d..016fb30 100644
26+ sub_tools.depends -= sub_src 27+ sub_tools.depends -= sub_src
27+ SUBDIRS = sub_tools 28+ SUBDIRS = sub_tools
28+} 29+}
30diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
31index 8ba2d9a..e973d93 100644
32--- a/src/3rdparty/assimp/assimp_dependency.pri
33+++ b/src/3rdparty/assimp/assimp_dependency.pri
34@@ -1,5 +1,5 @@
35 QT_FOR_CONFIG += 3dcore-private
36-qtConfig(system-assimp):!if(cross_compile:host_build) {
37+!tools-only:qtConfig(system-assimp):!if(cross_compile:host_build) {
38 QMAKE_USE_PRIVATE += assimp
39 } else {
40 include(assimp.pri)
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 9708ec92..f39208a8 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -3,9 +3,9 @@ require qt5-git.inc
3 3
4LICENSE = "LGPL-3.0 | GPL-2.0" 4LICENSE = "LGPL-3.0 | GPL-2.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ 6 file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \
7 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 7 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
8 file://LICENSE.GPL;md5=05832301944453ec79e40ba3c3cfceec \ 8 file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \
9" 9"
10 10
11DEPENDS += "qtbase" 11DEPENDS += "qtbase"
@@ -18,15 +18,22 @@ SRC_URI += " \
18PACKAGECONFIG ??= "" 18PACKAGECONFIG ??= ""
19PACKAGECONFIG_class-native ??= "tools-only" 19PACKAGECONFIG_class-native ??= "tools-only"
20PACKAGECONFIG_class-nativesdk ??= "tools-only" 20PACKAGECONFIG_class-nativesdk ??= "tools-only"
21PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" 21PACKAGECONFIG[tools-only] = ""
22PACKAGECONFIG[system-assimp] = "-feature-system-assimp,-no-feature-system-assimp,assimp"
23PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
22 24
23EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
24 26
25FILES_${PN}-qmlplugins += " \ 27EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tools-only', 'CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib', '', d)}"
26 ${OE_QMAKE_PATH_QML}/*/*/*.bez \ 28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtgamepad', 'CONFIG+=OE_QTGAMEPAD_ENABLED', '', d)}"
27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \ 29
28" 30do_configure_prepend() {
31 # disable qtgamepad test if it isn't enabled by PACKAGECONFIG
32 sed -e 's/^\(qtHaveModule(gamepad)\)/OE_QTGAMEPAD_ENABLED:\1/' -i \
33 ${S}/src/input/frontend/frontend.pri \
34 ${S}/src/quick3d/imports/input/importsinput.pro
35}
29 36
30SRCREV = "c3fdb888fbd94de0f6b7b1a6859cba8132ecc93d" 37SRCREV = "440589a0747d9668fec3ff924b390d75be5c6733"
31 38
32BBCLASSEXTEND += "native nativesdk" 39BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index e1e25ba7..f8649533 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,8 +2,8 @@
2# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.7" 5QT_MODULE_BRANCH ?= "5.8"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
9SRC_URI = " \ 9SRC_URI = " \
@@ -12,4 +12,4 @@ SRC_URI = " \
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
15PV = "5.7.0+git${SRCPV}" 15PV = "5.8.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index b066dded..90d7896f 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -6,7 +6,9 @@ inherit qmake5
6PACKAGECONFIG_OPENSSL ?= "openssl" 6PACKAGECONFIG_OPENSSL ?= "openssl"
7 7
8PACKAGECONFIG[examples] = "" 8PACKAGECONFIG[examples] = ""
9PACKAGECONFIG[tests] = ""
9EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" 10EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}"
11EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', '', d)}"
10 12
11# we don't want conflicts with qt4 13# we don't want conflicts with qt4
12OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" 14OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
@@ -103,11 +105,13 @@ FILES_${PN}-qmlplugins = " \
103 ${OE_QMAKE_PATH_QML}/*/*.qmltypes \ 105 ${OE_QMAKE_PATH_QML}/*/*.qmltypes \
104 ${OE_QMAKE_PATH_QML}/*/*.qml \ 106 ${OE_QMAKE_PATH_QML}/*/*.qml \
105 ${OE_QMAKE_PATH_QML}/*/*.js \ 107 ${OE_QMAKE_PATH_QML}/*/*.js \
108 ${OE_QMAKE_PATH_QML}/*/*.png \
106 ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \ 109 ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \
107 ${OE_QMAKE_PATH_QML}/*/*/qmldir \ 110 ${OE_QMAKE_PATH_QML}/*/*/qmldir \
108 ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \ 111 ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \
109 ${OE_QMAKE_PATH_QML}/*/*/*.qml \ 112 ${OE_QMAKE_PATH_QML}/*/*/*.qml \
110 ${OE_QMAKE_PATH_QML}/*/*/*.js \ 113 ${OE_QMAKE_PATH_QML}/*/*/*.js \
114 ${OE_QMAKE_PATH_QML}/*/*/*.png \
111 ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \ 115 ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \
112 ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \ 116 ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \
113 ${OE_QMAKE_PATH_QML}/*/*/*/images \ 117 ${OE_QMAKE_PATH_QML}/*/*/*/images \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 4da56405..ba1be2c1 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -22,33 +22,22 @@ require qt5-git.inc
22# common for qtbase-native, qtbase-nativesdk and qtbase 22# common for qtbase-native, qtbase-nativesdk and qtbase
23SRC_URI += "\ 23SRC_URI += "\
24 file://0001-Add-linux-oe-g-platform.patch \ 24 file://0001-Add-linux-oe-g-platform.patch \
25 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
26 file://0003-Add-external-hostbindir-option.patch \ 25 file://0003-Add-external-hostbindir-option.patch \
27 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 26 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
28 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 27 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
29 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
30 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
31 file://0008-configure-paths-for-target-qmake-properly.patch \ 28 file://0008-configure-paths-for-target-qmake-properly.patch \
32 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \ 29 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
33 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 30 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
34" 31"
35 32
36# common for qtbase-native and nativesdk-qtbase 33# common for qtbase-native and nativesdk-qtbase
37SRC_URI += " \ 34SRC_URI += " \
38 file://0011-Always-build-uic.patch \ 35 file://0011-Always-build-uic.patch \
39 file://0012-Add-external-hostbindir-option-for-native-sdk.patch \
40" 36"
41 37
42CLEANBROKEN = "1" 38CLEANBROKEN = "1"
43 39
44QT_CONF_PATH = "${B}/qt.conf"
45
46do_generate_qt_config_file() {
47 :
48}
49
50PACKAGECONFIG_CONFARGS = " \ 40PACKAGECONFIG_CONFARGS = " \
51 -prefix ${prefix} \
52 -sysroot ${STAGING_DIR_NATIVE} \ 41 -sysroot ${STAGING_DIR_NATIVE} \
53 -no-gcc-sysroot \ 42 -no-gcc-sysroot \
54 -system-zlib \ 43 -system-zlib \
@@ -68,11 +57,15 @@ PACKAGECONFIG_CONFARGS = " \
68 -verbose \ 57 -verbose \
69 -release \ 58 -release \
70 -prefix ${OE_QMAKE_PATH_PREFIX} \ 59 -prefix ${OE_QMAKE_PATH_PREFIX} \
60 -hostprefix ${OE_QMAKE_PATH_PREFIX} \
71 -bindir ${OE_QMAKE_PATH_BINS} \ 61 -bindir ${OE_QMAKE_PATH_BINS} \
62 -hostbindir ${OE_QMAKE_PATH_BINS} \
72 -libdir ${OE_QMAKE_PATH_LIBS} \ 63 -libdir ${OE_QMAKE_PATH_LIBS} \
64 -hostlibdir ${OE_QMAKE_PATH_LIBS} \
73 -headerdir ${OE_QMAKE_PATH_HEADERS} \ 65 -headerdir ${OE_QMAKE_PATH_HEADERS} \
74 -archdatadir ${OE_QMAKE_PATH_ARCHDATA} \ 66 -archdatadir ${OE_QMAKE_PATH_ARCHDATA} \
75 -datadir ${OE_QMAKE_PATH_DATA} \ 67 -datadir ${OE_QMAKE_PATH_DATA} \
68 -hostdatadir ${QMAKE_MKSPEC_PATH_NATIVE} \
76 -docdir ${OE_QMAKE_PATH_DOCS} \ 69 -docdir ${OE_QMAKE_PATH_DOCS} \
77 -sysconfdir ${OE_QMAKE_PATH_SETTINGS} \ 70 -sysconfdir ${OE_QMAKE_PATH_SETTINGS} \
78 -no-glib \ 71 -no-glib \
@@ -84,20 +77,8 @@ PACKAGECONFIG_CONFARGS = " \
84 -platform linux-oe-g++ \ 77 -platform linux-oe-g++ \
85" 78"
86 79
87# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell
88export OE_QMAKE_COMPILER
89export OE_QMAKE_CC
90export OE_QMAKE_CFLAGS
91export OE_QMAKE_CXX
92export OE_QMAKE_CXXFLAGS
93export OE_QMAKE_LINK
94export OE_QMAKE_LDFLAGS
95export OE_QMAKE_AR
96export OE_QMAKE_STRIP
97
98do_configure_prepend() { 80do_configure_prepend() {
99 MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" 81 MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}"
100 bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}"
101} 82}
102 83
103do_install() { 84do_install() {
@@ -123,4 +104,4 @@ do_install() {
123 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 104 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
124} 105}
125 106
126SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd" 107SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980"
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 b28ca8b6..df2016e1 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From d6c75f788e15fb552eacb08359698a1342a97f20 Mon Sep 17 00:00:00 2001 1From 2784921c40d0b523c75e613e48b7fd1e90ba3ef1 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH] Add linux-oe-g++ platform 4Subject: [PATCH] Add linux-oe-g++ platform
@@ -7,176 +7,53 @@ Subject: [PATCH] Add linux-oe-g++ platform
7 shell environment, because it's easier for qt recipes to export 7 shell environment, because it's easier for qt recipes to export
8 *FLAGS or CC specific for given recipe 8 *FLAGS or CC specific for given recipe
9 9
10* configure: add getQEvalMakeConf and getXQEvalMakeConf 10* configure: extend setBootstrapVariable to convert $$(...) operator
11 Allow expansion of $(...) references from qmake.conf to generate 11 to $(...) operator to work in qmake's Makefiles
12 qmake environment from shell environment as exported by qmake5_base
13
14* configure: don't export SYSTEM_VARIABLES to .qmake.vars
15 linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
16 causing issues as we need g++ to be used as linker
17 12
18* configure.prf: Allow to add extra arguments to make 13* configure.prf: Allow to add extra arguments to make
19 sometimes we would like to add -e or define some variable and respect it from both 14 sometimes we would like to add -e or define some variable and respect it from both
20 Makefiles used in configure tests and also Makefiles to build the application 15 Makefiles used in configure tests and also Makefiles to build the application
21 16
22* OE_QMAKE_CXX in order to allow compiler version check to succeed
23 which allows WebKit to be enabled.
24
25* Other variables in order to let config.tests to use our -platform
26 settings
27
28* Add setBootstrapEvalVariable to bootstrap qmake with our environment
29 too, this allows us to use -platform linux-oe-g++ also for native
30 recipe
31
32* disable gdb_dwarf_index
33 * qmake is trying to call native gdb and we don't depend on gdb-native
34 (or even provide gdb-native)
35 * fixes errors like this:
36 /bin/sh: gdb: command not found
37 /bin/sh: line 0: test: -gt: unary operator expected
38 which are not fatal, but still misleading in do_configure output
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
44Upstream-Status: Inappropriate [embedded specific] 17Upstream-Status: Inappropriate [embedded specific]
45 too OE specific, probably cannot be upstreamed 18 too OE specific, probably cannot be upstreamed
46 19
47Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c 20Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c
48Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 21Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
49--- 22---
50 configure | 55 ++++++++++++------- 23 configure | 2 +-
51 mkspecs/features/configure.prf | 4 +- 24 mkspecs/features/configure.prf | 4 ++--
52 mkspecs/linux-oe-g++/qmake.conf | 42 +++++++++++++++ 25 mkspecs/features/qt_functions.prf | 2 +-
53 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ 26 mkspecs/linux-oe-g++/qmake.conf | 43 ++++++++++++++++++++++++++++++++++++
54 4 files changed, 181 insertions(+), 20 deletions(-) 27 mkspecs/linux-oe-g++/qplatformdefs.h | 1 +
28 5 files changed, 48 insertions(+), 4 deletions(-)
55 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 29 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
56 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 30 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
57 31
58diff --git a/configure b/configure 32diff --git a/configure b/configure
59index 0ba0c31..052872e 100755 33index 789ba4c..59cce01 100755
60--- a/configure 34--- a/configure
61+++ b/configure 35+++ b/configure
62@@ -333,6 +333,16 @@ getQMakeConf() 36@@ -1624,7 +1624,7 @@ fi
63 getSingleQMakeVariable "$1" "$specvals" 37 # is where the resulting variable is written to
64 } 38 setBootstrapVariable()
65
66+# OE qmake.conf is reading some variables from shell env
67+# read them from qmake.conf, replace qmake () syntax with shell and eval
68+getQEvalMakeConf()
69+{
70+ VAL=`getQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
71+ EVAL=`eval "echo ${VAL}"`
72+# echo "Running getQEvalMakeConf: var='$1', val='`getQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
73+ eval "echo ${VAL}"
74+}
75+
76 getXQMakeConf()
77 { 39 {
78 if [ -z "$xspecvals" ]; then 40- getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
79@@ -357,6 +367,16 @@ testXConfig() 41+ getQMakeConf "$1" | sed 's:\$\$(:\$(:' | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
80 esac
81 }
82
83+# OE qmake.conf is reading some variables from shell env
84+# read them from qmake.conf, replace qmake () syntax with shell and eval
85+getXQEvalMakeConf()
86+{
87+ VAL=`getXQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
88+ EVAL=`eval "echo ${VAL}"`
89+# echo "Running getXQEvalMakeConf: var='$1', val='`getXQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
90+ eval "echo ${VAL}"
91+}
92+
93 compilerSupportsFlag()
94 {
95 cat >conftest.cpp <<EOF
96@@ -578,24 +598,14 @@ fi
97 # initalize variables
98 #-------------------------------------------------------------------------------
99
100-SYSTEM_VARIABLES="AR RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
101-for varname in $SYSTEM_VARIABLES; do
102+# Export all OE variables for qmake.conf from shell env to QMakeVars
103+OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP"
104+for varname in $OE_VARIABLES; do
105 qmakevarname="${varname}"
106- qmakecmdargs=""
107- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
108- if [ "${varname}" = "LDFLAGS" ]; then
109- qmakevarname="LFLAGS"
110- elif [ "${varname}" = "LD" ]; then
111- qmakevarname="LINK"
112- elif [ "${varname}" = "AR" ]; then
113- # QMAKE_AR needs to be set to "/path/to/ar cqs" but the
114- # environment variable will be set to the command only so we
115- # need to append " cqs" for autoconf compatibility
116- qmakecmdargs=" cqs"
117- fi
118 cmd=`echo \
119-'if [ -n "\$'${varname}'" ]; then
120- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}${qmakecmdargs}'"
121+'if [ -n "\$OE_QMAKE_'${varname}'" ]; then
122+ QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'"
123+# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2
124 fi'`
125 eval "$cmd"
126 done
127@@ -3443,7 +3453,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
128 [ "$CFG_GTK" = "auto" ] && CFG_GTK=no
129 fi
130
131-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
132+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX`
133
134 TEST_COMPILER=$QMAKE_CONF_COMPILER
135
136@@ -3494,7 +3504,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then
137 fi
138 fi
139
140-TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS`
141+TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS`
142
143 GCC_MACHINE_DUMP=
144 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
145@@ -3893,6 +3903,14 @@ setBootstrapVariable()
146 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
147 } 42 }
148 43
149+# OE qmake.conf is reading some variables from shell env
150+# read them from qmake.conf, replace qmake () syntax with shell and eval
151+setBootstrapEvalVariable()
152+{
153+ getQEvalMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
154+}
155+
156+
157 # build qmake 44 # build qmake
158 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
159 echo "Creating qmake..."
160@@ -3986,6 +4004,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
161 EXEEXT=
162 ;;
163 esac
164+ [ "$QT_CROSS_COMPILE" = "yes" ] && EXEEXT=-target
165 if [ "$BUILD_ON_MAC" = "yes" ]; then
166 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile"
167 echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
168diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 45diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
169index a890c7f..151630c 100644 46index f275e3a..5aa15f5 100644
170--- a/mkspecs/features/configure.prf 47--- a/mkspecs/features/configure.prf
171+++ b/mkspecs/features/configure.prf 48+++ b/mkspecs/features/configure.prf
172@@ -71,14 +71,14 @@ defineTest(qtCompileTest) { 49@@ -37,14 +37,14 @@ defineTest(qtCompileTest) {
173 } 50 }
174 51
175 # Clean up after previous run 52 # Clean up after previous run
176- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") 53- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
177+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") 54+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean")
178 55
179 mkpath($$test_out_dir)|error("Aborting.") 56 mkpath($$test_out_dir)|error()
180 57
181 !isEmpty (QMAKE_QTCONF): qtconfarg = -qtconf $$QMAKE_QTCONF 58 !isEmpty (QMAKE_QTCONF): qtconfarg = -qtconf $$QMAKE_QTCONF
182 59
@@ -186,157 +63,72 @@ index a890c7f..151630c 100644
186 log("yes$$escape_expand(\\n)") 63 log("yes$$escape_expand(\\n)")
187 msg = "test $$1 succeeded" 64 msg = "test $$1 succeeded"
188 write_file($$QMAKE_CONFIG_LOG, msg, append) 65 write_file($$QMAKE_CONFIG_LOG, msg, append)
66diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
67index 708815d..097ac49 100644
68--- a/mkspecs/features/qt_functions.prf
69+++ b/mkspecs/features/qt_functions.prf
70@@ -67,7 +67,7 @@ defineTest(qtHaveModule) {
71 defineTest(qtPrepareTool) {
72 cmd = $$eval(QT_TOOL.$${2}.binary)
73 isEmpty(cmd) {
74- cmd = $$[QT_HOST_BINS]/$$2
75+ cmd = $$[QT_HOST_BINS/get]/$$2
76 exists($${cmd}.pl) {
77 $${1}_EXE = $${cmd}.pl
78 cmd = perl -w $$system_path($${cmd}.pl)
189diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 79diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
190new file mode 100644 80new file mode 100644
191index 0000000..311ba04 81index 0000000..c1837e6
192--- /dev/null 82--- /dev/null
193+++ b/mkspecs/linux-oe-g++/qmake.conf 83+++ b/mkspecs/linux-oe-g++/qmake.conf
194@@ -0,0 +1,42 @@ 84@@ -0,0 +1,43 @@
195+# 85+#
196+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded 86+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
197+# 87+#
198+ 88+
199+MAKEFILE_GENERATOR = UNIX 89+MAKEFILE_GENERATOR = UNIX
200+CONFIG += incremental 90+CONFIG += incremental
201+QMAKE_INCREMENTAL_STYLE = sublib 91+QMAKE_INCREMENTAL_STYLE = sublib
202+ 92+
203+include(../common/linux.conf) 93+include(../common/linux.conf)
204+ 94+
205+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip 95+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
206+QMAKE_AR = $(OE_QMAKE_AR) cqs 96+QMAKE_AR = $$(OE_QMAKE_AR) cqs
207+QMAKE_STRIP = $(OE_QMAKE_STRIP) 97+QMAKE_STRIP = $$(OE_QMAKE_STRIP)
208+QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER) 98+QMAKE_WAYLAND_SCANNER = $$(OE_QMAKE_WAYLAND_SCANNER)
209+ 99+
210+include(../common/gcc-base-unix.conf) 100+include(../common/gcc-base-unix.conf)
211+ 101+
212+# *FLAGS from gcc-base.conf 102+# *FLAGS from gcc-base.conf
213+QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS) 103+QMAKE_CFLAGS += $$(OE_QMAKE_CFLAGS)
214+QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS) 104+QMAKE_CXXFLAGS += $$(OE_QMAKE_CXXFLAGS)
215+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) 105+QMAKE_LFLAGS += $$(OE_QMAKE_LDFLAGS)
216+ 106+
217+include(../common/g++-unix.conf) 107+include(../common/g++-unix.conf)
218+ 108+
219+# tc settings from g++-base.conf 109+# tc settings from g++-base.conf
220+QMAKE_COMPILER = $(OE_QMAKE_COMPILER) gcc 110+QMAKE_COMPILER = $$(OE_QMAKE_COMPILER) gcc
221+QMAKE_CC = $(OE_QMAKE_CC) 111+QMAKE_CC = $$(OE_QMAKE_CC)
222+QMAKE_CXX = $(OE_QMAKE_CXX) 112+QMAKE_CXX = $$(OE_QMAKE_CXX)
223+ 113+
224+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) 114+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(OE_QMAKE_CFLAGS)
225+ 115+
226+QMAKE_LINK = $(OE_QMAKE_LINK) 116+QMAKE_LINK = $$(OE_QMAKE_LINK)
227+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) 117+QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK)
228+QMAKE_LINK_C = $(OE_QMAKE_LINK) 118+QMAKE_LINK_C = $$(OE_QMAKE_LINK)
229+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) 119+QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK)
230+ 120+
231+# for the SDK 121+# for the SDK
232+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) 122+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
233+ 123+
234+include(../oe-device-extra.pri) 124+include(../oe-device-extra.pri)
235+ 125+
126+load(device_config)
236+load(qt_config) 127+load(qt_config)
237diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h 128diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
238new file mode 100644 129new file mode 100644
239index 0000000..dd12003 130index 0000000..5d22fb4
240--- /dev/null 131--- /dev/null
241+++ b/mkspecs/linux-oe-g++/qplatformdefs.h 132+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
242@@ -0,0 +1,100 @@ 133@@ -0,0 +1 @@
243+/**************************************************************************** 134+#include "../linux-g++/qplatformdefs.h"
244+**
245+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
246+** Contact: http://www.qt-project.org/legal
247+**
248+** This file is part of the qmake spec of the Qt Toolkit.
249+**
250+** $QT_BEGIN_LICENSE:LGPL$
251+** Commercial License Usage
252+** Licensees holding valid commercial Qt licenses may use this file in
253+** accordance with the commercial license agreement provided with the
254+** Software or, alternatively, in accordance with the terms contained in
255+** a written agreement between you and Digia. For licensing terms and
256+** conditions see http://qt.digia.com/licensing. For further information
257+** use the contact form at http://qt.digia.com/contact-us.
258+**
259+** GNU Lesser General Public License Usage
260+** Alternatively, this file may be used under the terms of the GNU Lesser
261+** General Public License version 2.1 as published by the Free Software
262+** Foundation and appearing in the file LICENSE.LGPL included in the
263+** packaging of this file. Please review the following information to
264+** ensure the GNU Lesser General Public License version 2.1 requirements
265+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
266+**
267+** In addition, as a special exception, Digia gives you certain additional
268+** rights. These rights are described in the Digia Qt LGPL Exception
269+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
270+**
271+** GNU General Public License Usage
272+** Alternatively, this file may be used under the terms of the GNU
273+** General Public License version 3.0 as published by the Free Software
274+** Foundation and appearing in the file LICENSE.GPL included in the
275+** packaging of this file. Please review the following information to
276+** ensure the GNU General Public License version 3.0 requirements will be
277+** met: http://www.gnu.org/copyleft/gpl.html.
278+**
279+**
280+** $QT_END_LICENSE$
281+**
282+****************************************************************************/
283+
284+#ifndef QPLATFORMDEFS_H
285+#define QPLATFORMDEFS_H
286+
287+// Get Qt defines/settings
288+
289+#include "qglobal.h"
290+
291+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
292+
293+// 1) need to reset default environment if _BSD_SOURCE is defined
294+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
295+// 3) it seems older glibc need this to include the X/Open stuff
296+#ifndef _GNU_SOURCE
297+# define _GNU_SOURCE
298+#endif
299+
300+#include <unistd.h>
301+
302+
303+// We are hot - unistd.h should have turned on the specific APIs we requested
304+
305+#include <features.h>
306+#include <pthread.h>
307+#include <dirent.h>
308+#include <fcntl.h>
309+#include <grp.h>
310+#include <pwd.h>
311+#include <signal.h>
312+
313+#include <sys/types.h>
314+#include <sys/ioctl.h>
315+#include <sys/ipc.h>
316+#include <sys/time.h>
317+#include <sys/shm.h>
318+#include <sys/socket.h>
319+#include <sys/stat.h>
320+#include <sys/wait.h>
321+#include <netinet/in.h>
322+#ifndef QT_NO_IPV6IFNAME
323+#include <net/if.h>
324+#endif
325+
326+#define QT_USE_XOPEN_LFS_EXTENSIONS
327+#include "../common/posix/qplatformdefs.h"
328+
329+#undef QT_SOCKLEN_T
330+
331+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
332+#define QT_SOCKLEN_T socklen_t
333+#else
334+#define QT_SOCKLEN_T int
335+#endif
336+
337+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
338+#define QT_SNPRINTF ::snprintf
339+#define QT_VSNPRINTF ::vsnprintf
340+#endif
341+
342+#endif // QPLATFORMDEFS_H
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
deleted file mode 100644
index 699e3856..00000000
--- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From e5f8607cfa1d2bcc798686cdf7c87ea0c6577d30 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
5 environment
6
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
9the same qmake binary to build qt/x11 and qt/embedded
10
11Upstream-Status: Inappropriate [embedded specific]
12 again very OE specific to read everything from environment (reusing the same
13 qmake from sstate and replacing all configured paths in it with qt.conf from
14 environment).
15
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 src/corelib/global/qlibraryinfo.cpp | 5 ++++-
19 1 file changed, 4 insertions(+), 1 deletion(-)
20
21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
22index 4582001..ff65ef9 100644
23--- a/src/corelib/global/qlibraryinfo.cpp
24+++ b/src/corelib/global/qlibraryinfo.cpp
25@@ -163,7 +163,10 @@ void QLibrarySettings::load()
26
27 QSettings *QLibraryInfoPrivate::findConfiguration()
28 {
29- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
30+ QByteArray config = getenv("QT_CONF_PATH");
31+ QString qtconfig = QFile::decodeName(config);
32+ if(!QFile::exists(qtconfig))
33+ qtconfig = QStringLiteral(":/qt/etc/qt.conf");
34 if (QFile::exists(qtconfig))
35 return new QSettings(qtconfig, QSettings::IniFormat);
36 #ifdef QT_BUILD_QMAKE
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 381cde29..8224171a 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,165 +1,23 @@
1From c1dc6165d6a085f162ed32ef5697f645019f9ee0 Mon Sep 17 00:00:00 2001 1From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH] Add -external-hostbindir option 4Subject: [PATCH] Add -external-hostbindir option
5 5
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
8
9* this way we can skip bootstraping tools we already have
10
11* qt_functions: temporary remove isEmpty check
12* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
13* isEmpty works correctly only with qmake variables (e.g. $$FOO -
14 isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
15
16* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries 6* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries
17 7
18Upstream-Status: Pending 8Upstream-Status: Inappropriate [OE specific]
19 is a lot better for upstreaming (and it was already sort of approved by
20 Oswald) but in 5.2.0 I've noticed that he added something similar for
21 android builds
22 9
23Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
24Signed-off-by: Simon Busch <morphis@gravedo.de> 11Signed-off-by: Simon Busch <morphis@gravedo.de>
25Signed-off-by: Jonathan Liu <net147@gmail.com> 12Signed-off-by: Jonathan Liu <net147@gmail.com>
26 13
27Conflicts:
28 configure
29
30Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 14Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2
31--- 15---
32 configure | 14 ++++++++++++++ 16 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
33 mkspecs/features/qt_functions.prf | 6 +++++- 17 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
34 mkspecs/features/qt_tool.prf | 4 +++- 18 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
35 qtbase.pro | 16 ++++++++++++++++ 19 3 files changed, 6 insertions(+), 6 deletions(-)
36 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
37 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
38 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
39 7 files changed, 44 insertions(+), 8 deletions(-)
40 20
41diff --git a/configure b/configure
42index 052872e..1fcbb3a 100755
43--- a/configure
44+++ b/configure
45@@ -834,6 +834,7 @@ QT_HOST_BINS=
46 QT_HOST_LIBS=
47 QT_HOST_DATA=
48 QT_EXT_PREFIX=
49+QT_EXTERNAL_HOST_BINS=
50
51 #flags for SQL drivers
52 QT_CFLAGS_PSQL=
53@@ -953,6 +954,7 @@ while [ "$#" -gt 0 ]; do
54 -testsdir| \
55 -hostdatadir| \
56 -hostbindir| \
57+ -external-hostbindir| \
58 -hostlibdir| \
59 -extprefix| \
60 -sysroot| \
61@@ -1185,6 +1187,9 @@ while [ "$#" -gt 0 ]; do
62 extprefix)
63 QT_EXT_PREFIX="$VAL"
64 ;;
65+ external-hostbindir)
66+ QT_EXTERNAL_HOST_BINS="$VAL"
67+ ;;
68 pkg-config)
69 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
70 CFG_PKGCONFIG="$VAL"
71@@ -2447,6 +2452,10 @@ Installation options:
72 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
73 (default HOSTPREFIX)
74
75+ -external-hostbindir <dir> Use external host executables instead of building them
76+ (not used by defaut)
77+
78+
79 Configure options:
80
81 The defaults (*) are usually acceptable. A plus (+) denotes a default value
82@@ -3209,6 +3218,11 @@ fi
83 # command line and environment validation
84 #-------------------------------------------------------------------------------
85
86+# default is empty, don't call makeabs if it is empty
87+if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
88+ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
89+fi
90+
91 # update QT_CONFIG to show our current predefined configuration
92 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
93 case "$CFG_QCONFIG" in
94diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
95index 54641ce..7d7baa4 100644
96--- a/mkspecs/features/qt_functions.prf
97+++ b/mkspecs/features/qt_functions.prf
98@@ -71,7 +71,11 @@ defineTest(qtHaveModule) {
99 defineTest(qtPrepareTool) {
100 cmd = $$eval(QT_TOOL.$${2}.binary)
101 isEmpty(cmd) {
102- cmd = $$[QT_HOST_BINS]/$$2
103+ QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS]
104+ isEmpty(QT_EXTERNAL_HOST_BINS): \
105+ cmd = $$[QT_HOST_BINS]/$$2
106+ else: \
107+ cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2
108 exists($${cmd}.pl) {
109 $${1}_EXE = $${cmd}.pl
110 cmd = perl -w $$system_path($${cmd}.pl)
111diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
112index bdeb59c..b8c539f 100644
113--- a/mkspecs/features/qt_tool.prf
114+++ b/mkspecs/features/qt_tool.prf
115@@ -14,10 +14,12 @@ load(qt_app)
116 CONFIG += console
117 DEFINES *= QT_USE_QSTRINGBUILDER
118
119+QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS]
120+
121 # If we are doing a prefix build, create a "module" pri which enables
122 # qtPrepareTool() to work with the non-installed build.
123 # Non-bootstrapped tools always need this because of the environment setup.
124-!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)) {
125+!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)):isEmpty(QT_EXTERNAL_HOST_BINS) {
126 isEmpty(MODULE):MODULE = $$TARGET
127
128 load(qt_build_paths)
129diff --git a/qtbase.pro b/qtbase.pro
130index 11cff9e..ec03669 100644
131--- a/qtbase.pro
132+++ b/qtbase.pro
133@@ -38,6 +38,19 @@ CONFIG -= qt
134
135 ### installations ####
136
137+QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS]
138+
139+#qmake
140+qmake.path = $$[QT_HOST_BINS]
141+qmake.files = $$OUT_PWD/bin/qmake
142+!isEmpty(QT_EXTERNAL_HOST_BINS) {
143+ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake
144+}
145+equals(QMAKE_HOST.os, Windows) {
146+ qmake.files = $${qmake.files}.exe
147+}
148+INSTALLS += qmake
149+
150 #licheck
151 licheck.path = $$[QT_HOST_BINS]
152 licheck.files = $$PWD/bin/$$QT_LICHECK
153@@ -51,6 +64,9 @@ INSTALLS += fixqt4headers
154 #syncqt
155 syncqt.path = $$[QT_HOST_BINS]
156 syncqt.files = $$PWD/bin/syncqt.pl
157+!isEmpty(QT_EXTERNAL_HOST_BINS) {
158+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/syncqt.pl
159+}
160 INSTALLS += syncqt
161
162 # If we are doing a prefix build, create a "module" pri which enables
163diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
164index a5ed8b2..0e11a1e 100644 22index a5ed8b2..0e11a1e 100644
165--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
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 e24d4758..c105488e 100644
--- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -1,4 +1,4 @@
1From d83234c35de8f52ce3bf6eb262ad8e6af467ac34 Mon Sep 17 00:00:00 2001 1From bf1498618415e7b1e57b54881b1e56d74f2cdf6b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200 3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements 4Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
@@ -68,7 +68,7 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
68 2 files changed, 14 insertions(+), 1 deletion(-) 68 2 files changed, 14 insertions(+), 1 deletion(-)
69 69
70diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf 70diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
71index 71e96b4..0d7535c 100644 71index 0c5f080..a6e4f09 100644
72--- a/mkspecs/features/qt.prf 72--- a/mkspecs/features/qt.prf
73+++ b/mkspecs/features/qt.prf 73+++ b/mkspecs/features/qt.prf
74@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { 74@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) {
@@ -89,13 +89,13 @@ index 71e96b4..0d7535c 100644
89+} 89+}
90+ 90+
91 QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN 91 QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN
92 contains(QT_CONFIG, static) { 92 qtConfig(static) {
93 QT_PLUGIN_VERIFY += QTPLUGIN 93 QT_PLUGIN_VERIFY += QTPLUGIN
94diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 94diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
95index b367bc1..209cc43 100644 95index e754a17..4c1530e 100644
96--- a/mkspecs/features/qt_common.prf 96--- a/mkspecs/features/qt_common.prf
97+++ b/mkspecs/features/qt_common.prf 97+++ b/mkspecs/features/qt_common.prf
98@@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { 98@@ -37,7 +37,7 @@ contains(TEMPLATE, .*lib) {
99 lib_replace.replace = 99 lib_replace.replace =
100 } else { 100 } else {
101 lib_replace.match = $$rplbase/lib 101 lib_replace.match = $$rplbase/lib
diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
deleted file mode 100644
index c58b1d9a..00000000
--- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
+++ /dev/null
@@ -1,154 +0,0 @@
1From f207997b59f1381cf3523521209cb435b1a73f25 Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Thu, 16 May 2013 09:52:07 +0300
4Subject: [PATCH] QOpenGLPaintDevice sub-area support
5
6Allows creating QOpenGLPaintDevice targetting sub-area
7of binded framebuffer.
8
9Upstream-Status: Pending
10
11Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80
12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 src/gui/opengl/qopenglpaintdevice.cpp | 11 +++++++++++
16 src/gui/opengl/qopenglpaintdevice.h | 2 ++
17 src/gui/opengl/qopenglpaintdevice_p.h | 1 +
18 src/gui/opengl/qopenglpaintengine.cpp | 9 +++++++--
19 src/gui/opengl/qopenglpaintengine_p.h | 1 +
20 src/gui/opengl/qopengltextureglyphcache.cpp | 2 +-
21 6 files changed, 23 insertions(+), 3 deletions(-)
22
23diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
24index 75f09d6..17d7155 100644
25--- a/src/gui/opengl/qopenglpaintdevice.cpp
26+++ b/src/gui/opengl/qopenglpaintdevice.cpp
27@@ -141,6 +141,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height)
28 {
29 }
30
31+QOpenGLPaintDevice::QOpenGLPaintDevice(int x, int y, int width, int height)
32+ : d_ptr(new QOpenGLPaintDevicePrivate(QSize(width, height)))
33+{
34+ d_ptr->offset = QPoint(x,y);
35+}
36+
37 /*!
38 \internal
39 */
40@@ -222,6 +228,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const
41 return d_ptr->ctx;
42 }
43
44+QPoint QOpenGLPaintDevice::offset() const
45+{
46+ return d_ptr->offset;
47+}
48+
49 /*!
50 Returns the pixel size of the paint device.
51
52diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
53index dffa68c..66a1e3d 100644
54--- a/src/gui/opengl/qopenglpaintdevice.h
55+++ b/src/gui/opengl/qopenglpaintdevice.h
56@@ -59,12 +59,14 @@ public:
57 QOpenGLPaintDevice();
58 explicit QOpenGLPaintDevice(const QSize &size);
59 QOpenGLPaintDevice(int width, int height);
60+ QOpenGLPaintDevice(int x, int y, int width, int height);
61 virtual ~QOpenGLPaintDevice();
62
63 int devType() const { return QInternal::OpenGL; }
64 QPaintEngine *paintEngine() const;
65
66 QOpenGLContext *context() const;
67+ QPoint offset() const;
68 QSize size() const;
69 void setSize(const QSize &size);
70 void setDevicePixelRatio(qreal devicePixelRatio);
71diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h
72index 78e6b7a..6630461 100644
73--- a/src/gui/opengl/qopenglpaintdevice_p.h
74+++ b/src/gui/opengl/qopenglpaintdevice_p.h
75@@ -71,6 +71,7 @@ public:
76
77 public:
78 QSize size;
79+ QPoint offset;
80 QOpenGLContext *ctx;
81
82 qreal dpmx;
83diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
84index d93871c..be2bee9 100644
85--- a/src/gui/opengl/qopenglpaintengine.cpp
86+++ b/src/gui/opengl/qopenglpaintengine.cpp
87@@ -2084,7 +2084,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
88 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
89 d->vertexAttributeArraysEnabledState[i] = false;
90
91+ const QPoint offset = d->device->offset();
92 const QSize sz = d->device->size();
93+ d->x = offset.x();
94+ d->y = offset.y();
95 d->width = sz.width();
96 d->height = sz.height();
97 d->mode = BrushDrawingMode;
98@@ -2171,7 +2174,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
99 d->device->ensureActiveTarget();
100
101 d->transferMode(BrushDrawingMode);
102- d->funcs.glViewport(0, 0, d->width, d->height);
103+ d->funcs.glViewport(d->x, d->y, d->width, d->height);
104 d->needsSync = false;
105 d->shaderManager->setDirty();
106 d->syncGlState();
107@@ -2213,6 +2216,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
108 if (bounds == QRect(0, 0, width, height)) {
109 funcs.glDisable(GL_SCISSOR_TEST);
110 } else {
111+ bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height());
112 funcs.glEnable(GL_SCISSOR_TEST);
113 setScissor(bounds);
114 }
115@@ -2221,12 +2225,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
116
117 void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
118 {
119- const int left = rect.left();
120+ const int left = rect.left() + x;
121 const int width = rect.width();
122 int bottom = height - (rect.top() + rect.height());
123 if (device->paintFlipped()) {
124 bottom = rect.top();
125 }
126+ bottom += y;
127 const int height = rect.height();
128
129 funcs.glScissor(left, bottom, width, height);
130diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
131index c9f3282..7c0616b 100644
132--- a/src/gui/opengl/qopenglpaintengine_p.h
133+++ b/src/gui/opengl/qopenglpaintengine_p.h
134@@ -270,6 +270,7 @@ public:
135 QOpenGL2PaintEngineEx* q;
136 QOpenGLEngineShaderManager* shaderManager;
137 QOpenGLPaintDevice* device;
138+ int x, y;
139 int width, height;
140 QOpenGLContext *ctx;
141 EngineMode mode;
142diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
143index 9a7b1eb..6f301f8 100644
144--- a/src/gui/opengl/qopengltextureglyphcache.cpp
145+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
146@@ -403,7 +403,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
147 funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
148
149 if (pex != 0) {
150- funcs->glViewport(0, 0, pex->width, pex->height);
151+ funcs->glViewport(pex->x, pex->y, pex->width, pex->height);
152 pex->updateClipScissorTest();
153 } else {
154 if (m_vao.isCreated()) {
diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
deleted file mode 100644
index 4ea4061a..00000000
--- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 7ab6ff7ba20a3173c10a76814d3c9ed312c80627 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 8 Jun 2015 13:59:25 -0700
4Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T
5
6This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
7only when its glibc < 2 and not also for the libraries which may define
8it as per standards but are not glibc, e.g. musl
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
16index dd12003..8623651 100644
17--- a/mkspecs/linux-oe-g++/qplatformdefs.h
18+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
19@@ -86,10 +86,10 @@
20
21 #undef QT_SOCKLEN_T
22
23-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
24-#define QT_SOCKLEN_T socklen_t
25-#else
26+#if defined(__GLIBC__) && (__GLIBC__ < 2)
27 #define QT_SOCKLEN_T int
28+#else
29+#define QT_SOCKLEN_T socklen_t
30 #endif
31
32 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
index bac18412..6d64e6b5 100644
--- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
+++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
@@ -1,4 +1,4 @@
1From 0f4ab3e27938002134e8f3f9eb12cf9c50b2ab95 Mon Sep 17 00:00:00 2001 1From cc926956758bf8170c4e49c66e1066524b43f65f Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 13 Nov 2015 12:36:11 +0100 3Date: Fri, 13 Nov 2015 12:36:11 +0100
4Subject: [PATCH] configure paths for target qmake properly 4Subject: [PATCH] configure paths for target qmake properly
@@ -19,11 +19,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 19 insertions(+), 4 deletions(-) 19 1 file changed, 19 insertions(+), 4 deletions(-)
20 20
21diff --git a/configure b/configure 21diff --git a/configure b/configure
22index f49a674..d30d0ca 100755 22index 8b33c5b..1df248f 100755
23--- a/configure 23--- a/configure
24+++ b/configure 24+++ b/configure
25@@ -3792,8 +3792,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then 25@@ -1545,8 +1545,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then
26 QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" 26 fi
27 fi 27 fi
28 28
29-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` 29-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
@@ -38,7 +38,7 @@ index f49a674..d30d0ca 100755
38 38
39 QT_CONFIGURE_STR_OFF=0 39 QT_CONFIGURE_STR_OFF=0
40 40
41@@ -3826,7 +3831,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS 41@@ -1579,7 +1584,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
42 42
43 QT_CONFIGURE_STR_OFFSETS= 43 QT_CONFIGURE_STR_OFFSETS=
44 QT_CONFIGURE_STRS= 44 QT_CONFIGURE_STRS=
@@ -51,7 +51,7 @@ index f49a674..d30d0ca 100755
51 addConfStr "$QT_REL_HOST_BINS" 51 addConfStr "$QT_REL_HOST_BINS"
52 addConfStr "$QT_REL_HOST_LIBS" 52 addConfStr "$QT_REL_HOST_LIBS"
53 addConfStr "$QT_REL_HOST_DATA" 53 addConfStr "$QT_REL_HOST_DATA"
54@@ -3838,6 +3847,12 @@ addConfStr "$shortspec" 54@@ -1591,6 +1600,12 @@ addConfStr "$shortspec"
55 #------------------------------------------------------------------------------- 55 #-------------------------------------------------------------------------------
56 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" 56 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
57 57
@@ -62,9 +62,9 @@ index f49a674..d30d0ca 100755
62+fi 62+fi
63+ 63+
64 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF 64 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
65 /* License Info */ 65 /* Installation date */
66 static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; 66 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
67@@ -3850,7 +3865,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 67@@ -1599,7 +1614,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
68 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; 68 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
69 #ifdef QT_BUILD_QMAKE 69 #ifdef QT_BUILD_QMAKE
70 static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; 70 static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
diff --git a/recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch
new file mode 100644
index 00000000..cb9de793
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch
@@ -0,0 +1,28 @@
1From 9eb81e3bdeda4f90e5f2942400aef38b51a356bd Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 24 Oct 2016 09:45:18 +0300
4Subject: [PATCH] Disable all unknown features instead of erroring out
5
6Task-number: QTBUG-56656
7Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
8---
9 mkspecs/features/qt_configure.prf | 3 ++-
10 1 file changed, 2 insertions(+), 1 deletion(-)
11
12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
13index e8fa0c6..0ca5670 100644
14--- a/mkspecs/features/qt_configure.prf
15+++ b/mkspecs/features/qt_configure.prf
16@@ -1009,7 +1009,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
18 return($$result)
19 }
20- error("Unknown feature object $${feature} in expression '$${1}'.")
21+ warning("Unknown feature object $${feature} in expression '$${1}'.")
22+ result = false
23 }
24 !qtConfCheckFeature($$feature): \
25 error("Expression '$$1' is accessing non-emitted feature $${feature}.")
26--
271.9.1
28
diff --git a/recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch b/recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch
deleted file mode 100644
index 23d0ab38..00000000
--- a/recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch
+++ /dev/null
@@ -1,95 +0,0 @@
1From 91b87aed0a2a96b0d6b54757ea13c75ee648a9b0 Mon Sep 17 00:00:00 2001
2From: Julien Gueytat <contact@jgueytat.fr>
3Date: Wed, 27 Apr 2016 19:24:39 +0200
4Subject: [PATCH] Reorder EGL libraries from pkgconfig and defaults:
5
6https://bugreports.qt.io/browse/QTBUG-50838
7https://bugreports.qt.io/browse/QTBUG-52739
8
9The modification is the less intrusive possible. It only swaps LIBS and QMAKE_LIBS_EGL.
10The reason behind that was that for the RaspberryPi:
11 * -lEGL -GLESv2 can link
12 * -lGLESv2 -lEGL can't
13
14Adding -lEGL -lGLESv2 and then -lEGL gives -lGLESv2 -lEGL ... the libraries swaped.
15
16Signed-off-by: Julien Gueytat <contact@jgueytat.fr>
17---
18 config.tests/qpa/egl/egl.pro | 5 ++++-
19 config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 12 +++++++-----
20 configure | 16 ++++++++++++++--
21 3 files changed, 25 insertions(+), 8 deletions(-)
22
23diff --git a/config.tests/qpa/egl/egl.pro b/config.tests/qpa/egl/egl.pro
24index b5396da..828b674 100644
25--- a/config.tests/qpa/egl/egl.pro
26+++ b/config.tests/qpa/egl/egl.pro
27@@ -5,6 +5,9 @@ for(p, QMAKE_LIBDIR_EGL) {
28 }
29
30 !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
31-!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
32+
33+BACKUP_LIBS = $$LIBS
34+!isEmpty(QMAKE_LIBS_EGL): LIBS = $$QMAKE_LIBS_EGL
35+LIBS += $$BACKUP_LIBS
36
37 CONFIG -= qt
38diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
39index d8b1c3e..06f7241 100644
40--- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
41+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
42@@ -1,11 +1,13 @@
43 SOURCES = eglfs-brcm.cpp
44
45-CONFIG -= qt
46-
47-INCLUDEPATH += $$QMAKE_INCDIR_EGL
48-
49 for(p, QMAKE_LIBDIR_EGL) {
50 LIBS += -L$$p
51 }
52
53-LIBS += -lEGL -lGLESv2 -lbcm_host
54+INCLUDEPATH += $$QMAKE_INCDIR_EGL
55+
56+BACKUP_LIBS = $$LIBS
57+LIBS = -lEGL -lGLESv2 -lbcm_host
58+LIBS += $$BACKUP_LIBS
59+
60+CONFIG -= qt
61diff --git a/configure b/configure
62index d30d0ca..14f348c 100755
63--- a/configure
64+++ b/configure
65@@ -5891,7 +5891,9 @@ if [ "$CFG_EGL" != "no" ]; then
66 QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
67 QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
68 QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`"
69- fi # detect EGL support
70+ fi
71+
72+ # detect EGL support
73 if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
74 CFG_EGL=yes
75 if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
76@@ -5914,8 +5916,18 @@ fi
77 if [ "$CFG_EGLFS" != "no" ]; then
78 if [ "$XPLATFORM_QNX" = "no" ] && [ "$CFG_OPENGL" != "no" ]; then
79 CFG_EGLFS="$CFG_EGL"
80+
81+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then
82+ QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
83+ QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null`
84+ QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null`
85+ QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
86+ QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
87+ QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`"
88+ fi
89+
90 # Detect eglfs backends.
91- if compileTest qpa/eglfs-brcm "eglfs-brcm"; then
92+ if compileTest qpa/eglfs-brcm "eglfs-brcm" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
93 CFG_EGLFS_BRCM=yes
94 else
95 CFG_EGLFS_BRCM=no
diff --git a/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch
deleted file mode 100644
index 1ab8abef..00000000
--- a/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch
+++ /dev/null
@@ -1,131 +0,0 @@
1From cb66a3193b1b1b8b402548b615c3675c4adcf13a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH] Add -external-hostbindir option for native(sdk)
5
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
8
9* this way we can skip bootstraping tools we already have
10
11* qt_functions: temporary remove isEmpty check
12* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
13* isEmpty works correctly only with qmake variables (e.g. $$FOO -
14 isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
15
16* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries
17
18Upstream-Status: Pending
19 is a lot better for upstreaming (and it was already sort of approved by
20 Oswald) but in 5.2.0 I've noticed that he added something similar for
21 android builds
22
23Change-Id: I4f6e634bf0b2cb96065ee5c38b9cd8a224c3bd37
24Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
25Signed-off-by: Simon Busch <morphis@gravedo.de>
26Signed-off-by: Jonathan Liu <net147@gmail.com>
27Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
28
29Conflicts:
30 tools/configure/configureapp.cpp
31---
32 configure | 1 +
33 qmake/property.cpp | 1 +
34 src/corelib/global/qlibraryinfo.cpp | 3 ++-
35 src/corelib/global/qlibraryinfo.h | 1 +
36 tools/configure/configureapp.cpp | 11 +++++++++++
37 5 files changed, 16 insertions(+), 1 deletion(-)
38
39diff --git a/configure b/configure
40index 14f348c..61f22e8 100755
41--- a/configure
42+++ b/configure
43@@ -3839,6 +3839,7 @@ fi
44 addConfStr "$QT_REL_HOST_BINS"
45 addConfStr "$QT_REL_HOST_LIBS"
46 addConfStr "$QT_REL_HOST_DATA"
47+addConfStr "$QT_EXTERNAL_HOST_BINS"
48 addConfStr "$shortxspec"
49 addConfStr "$shortspec"
50
51diff --git a/qmake/property.cpp b/qmake/property.cpp
52index 9ee08f4..e6ecf92 100644
53--- a/qmake/property.cpp
54+++ b/qmake/property.cpp
55@@ -63,6 +63,7 @@ static const struct {
56 { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
57 { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true },
58 { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true },
59+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true },
60 { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true },
61 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
62 };
63diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
64index ff65ef9..3726831 100644
65--- a/src/corelib/global/qlibraryinfo.cpp
66+++ b/src/corelib/global/qlibraryinfo.cpp
67@@ -381,7 +381,7 @@ QLibraryInfo::isDebugBuild()
68 */
69
70 static const struct {
71- char key[19], value[13];
72+ char key[21], value[13];
73 } qtConfEntries[] = {
74 { "Prefix", "." },
75 { "Documentation", "doc" }, // should be ${Data}/doc
76@@ -406,6 +406,7 @@ static const struct {
77 { "HostBinaries", "bin" },
78 { "HostLibraries", "lib" },
79 { "HostData", "." },
80+ { "ExternalHostBinaries", "" },
81 { "TargetSpec", "" },
82 { "HostSpec", "" },
83 { "HostPrefix", "" },
84diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
85index 362d47d..a2326e2 100644
86--- a/src/corelib/global/qlibraryinfo.h
87+++ b/src/corelib/global/qlibraryinfo.h
88@@ -87,6 +87,7 @@ public:
89 HostBinariesPath,
90 HostLibrariesPath,
91 HostDataPath,
92+ ExternalHostBinariesPath,
93 TargetSpecPath,
94 HostSpecPath,
95 HostPrefixPath,
96diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
97index 0fa205b..2921e2b 100644
98--- a/tools/configure/configureapp.cpp
99+++ b/tools/configure/configureapp.cpp
100@@ -1219,6 +1219,13 @@ void Configure::parseCmdLine()
101 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
102 }
103
104+ else if (configCmdLine.at(i) == "-external-hostbindir") {
105+ ++i;
106+ if (i == argCount)
107+ break;
108+ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i);
109+ }
110+
111 else if (configCmdLine.at(i) == "-make-tool") {
112 ++i;
113 if (i == argCount)
114@@ -4171,6 +4178,9 @@ void Configure::generateQConfigCpp()
115
116 if (dictionary["QT_REL_HOST_DATA"].isEmpty())
117 dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"];
118+
119+ if (dictionary["QT_EXTERNAL_HOST_BINS"].isEmpty())
120+ dictionary["QT_EXTERNAL_HOST_BINS"] = haveHpx ? "bin" : dictionary["QT_REL_INSTALL_BINS"];
121
122 confStringOff = 0;
123 addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]);
124@@ -4190,6 +4200,7 @@ void Configure::generateQConfigCpp()
125 addConfStr(1, dictionary["QT_REL_HOST_BINS"]);
126 addConfStr(1, dictionary["QT_REL_HOST_LIBS"]);
127 addConfStr(1, dictionary["QT_REL_HOST_DATA"]);
128+ addConfStr(1, dictionary["QT_EXTERNAL_HOST_BINS"]);
129 addConfStr(1, targSpec);
130 addConfStr(1, hostSpec);
131
diff --git a/recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch b/recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch
deleted file mode 100644
index 7b681dce..00000000
--- a/recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 2e176e3d10535e4fdaa6ecc919538f66f4a2930d Mon Sep 17 00:00:00 2001
2From: Andy Nichols <andy.nichols@qt.io>
3Date: Mon, 11 Jul 2016 09:18:33 +0200
4Subject: QWidgetBackingStore: Fix build with QT_NO_OPENGL
5
6A define moved out of the #ifndef QT_NO_OPENGL scope.
7
8Change-Id: I41c943b97f165b5171581e01f3a4b2d3fb25747e
9Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
10
11Upstream-Status: Backport
12Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
13---
14 src/widgets/kernel/qwidgetbackingstore.cpp | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp
18index 32aabce..242e625 100644
19--- a/src/widgets/kernel/qwidgetbackingstore.cpp
20+++ b/src/widgets/kernel/qwidgetbackingstore.cpp
21@@ -67,7 +67,9 @@ QT_BEGIN_NAMESPACE
22
23 extern QRegion qt_dirtyRegion(QWidget *);
24
25+#ifndef QT_NO_OPENGL
26 Q_GLOBAL_STATIC(QPlatformTextureList, qt_dummy_platformTextureList)
27+#endif
28
29 /**
30 * Flushes the contents of the \a backingStore into the screen area of \a widget.
31--
32cgit v1.0-4-g1e03
33
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 6541973e..354a01ce 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -17,16 +17,12 @@ LIC_FILES_CHKSUM = " \
17# common for qtbase-native, qtbase-nativesdk and qtbase 17# common for qtbase-native, qtbase-nativesdk and qtbase
18SRC_URI += "\ 18SRC_URI += "\
19 file://0001-Add-linux-oe-g-platform.patch \ 19 file://0001-Add-linux-oe-g-platform.patch \
20 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
21 file://0003-Add-external-hostbindir-option.patch \ 20 file://0003-Add-external-hostbindir-option.patch \
22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 21 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
23 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 22 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
24 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
25 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
26 file://0008-configure-paths-for-target-qmake-properly.patch \ 23 file://0008-configure-paths-for-target-qmake-properly.patch \
27 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \ 24 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
28 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 25 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
29 file://0013-Fix-build-with-QT_NO_OPENGL.patch \
30" 26"
31 27
32DEPENDS += "qtbase-native" 28DEPENDS += "qtbase-native"
@@ -39,16 +35,15 @@ RDEPENDS_${PN}-tools += "perl"
39# separate some parts of PACKAGECONFIG which are often changed 35# separate some parts of PACKAGECONFIG which are often changed
40PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 36PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
41PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 37PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
42PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xsync xshape xrender xrandr xfixes xinput2 xcursor glib xkb', '', d)}" 38PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb xkbcommon-evdev', '', d)}"
43PACKAGECONFIG_FONTS ?= "" 39PACKAGECONFIG_FONTS ?= ""
44PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" 40PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
45PACKAGECONFIG_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
46PACKAGECONFIG_DISTRO ?= "" 41PACKAGECONFIG_DISTRO ?= ""
47# Either release or debug, can be overridden in bbappends 42# Either release or debug, can be overridden in bbappends
48PACKAGECONFIG_RELEASE ?= "release" 43PACKAGECONFIG_RELEASE ?= "release"
49# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency 44# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency
50# PACKAGECONFIG_OPENSSL ?= "openssl" 45# PACKAGECONFIG_OPENSSL ?= "openssl"
51PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs" 46PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs freetype"
52 47
53PACKAGECONFIG ?= " \ 48PACKAGECONFIG ?= " \
54 ${PACKAGECONFIG_RELEASE} \ 49 ${PACKAGECONFIG_RELEASE} \
@@ -59,34 +54,37 @@ PACKAGECONFIG ?= " \
59 ${PACKAGECONFIG_X11} \ 54 ${PACKAGECONFIG_X11} \
60 ${PACKAGECONFIG_FONTS} \ 55 ${PACKAGECONFIG_FONTS} \
61 ${PACKAGECONFIG_SYSTEM} \ 56 ${PACKAGECONFIG_SYSTEM} \
62 ${PACKAGECONFIG_MULTIMEDIA} \
63 ${PACKAGECONFIG_DISTRO} \ 57 ${PACKAGECONFIG_DISTRO} \
64" 58"
65 59
66PACKAGECONFIG[release] = "-release,-debug" 60PACKAGECONFIG[release] = "-release,-debug"
67PACKAGECONFIG[debug] = "" 61PACKAGECONFIG[debug] = ""
68PACKAGECONFIG[developer] = "-developer-build" 62PACKAGECONFIG[developer] = "-developer-build"
63PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug"
69PACKAGECONFIG[sm] = "-sm,-no-sm" 64PACKAGECONFIG[sm] = "-sm,-no-sm"
70PACKAGECONFIG[tests] = "-make tests,-nomake tests" 65PACKAGECONFIG[tests] = "-make tests,-nomake tests"
71PACKAGECONFIG[examples] = "-make examples -compile-examples,-nomake examples" 66PACKAGECONFIG[examples] = "-make examples -compile-examples,-nomake examples"
72PACKAGECONFIG[tools] = "-make tools,-nomake tools" 67PACKAGECONFIG[tools] = "-make tools,-nomake tools"
73# only for completeness, configure will add libs even if you try to explicitly remove it 68# only for completeness, configure will add libs even if you try to explicitly remove it
74PACKAGECONFIG[libs] = "-make libs,-nomake libs" 69PACKAGECONFIG[libs] = "-make libs"
75# accessibility is required to compile qtquickcontrols 70# accessibility is required to compile qtquickcontrols
76PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" 71PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility"
77PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" 72PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0"
78# use either system freetype or bundled freetype, if you disable freetype completely 73# use either system freetype or bundled freetype, if you disable freetype completely
79# fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype 74# fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype
80# works only together with fontconfig 75# works only together with fontconfig
81PACKAGECONFIG[freetype] = "-system-freetype,-freetype,freetype" 76PACKAGECONFIG[freetype] = "-system-freetype,-qt-freetype,freetype"
82PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-no-harfbuzz,harfbuzz" 77PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-no-harfbuzz,harfbuzz"
83PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" 78PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg"
84PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" 79PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng"
80PACKAGECONFIG[gif] = "-gif,-no-gif"
81PACKAGECONFIG[ico] = "-ico,-no-ico"
85PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" 82PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib"
86PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre" 83PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre"
87PACKAGECONFIG[eglfs] = "-eglfs,-no-eglfs,drm" 84PACKAGECONFIG[eglfs] = "-eglfs,-no-eglfs,drm"
88PACKAGECONFIG[gl] = "-opengl desktop,,virtual/libgl" 85PACKAGECONFIG[gl] = "-opengl desktop,,virtual/libgl"
89PACKAGECONFIG[gles2] = "-opengl es2,,virtual/libgles2 virtual/egl" 86PACKAGECONFIG[gles2] = "-opengl es2,,virtual/libgles2 virtual/egl"
87PACKAGECONFIG[no-opengl] = "-no-opengl"
90PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" 88PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib"
91PACKAGECONFIG[cups] = "-cups,-no-cups,cups" 89PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
92PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" 90PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
@@ -100,14 +98,8 @@ PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds"
100PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" 98PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2"
101PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite" 99PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite"
102PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3" 100PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3"
103PACKAGECONFIG[xcursor] = "-xcursor,-no-xcursor,libxcursor"
104PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi" 101PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi"
105PACKAGECONFIG[xfixes] = "-xfixes,-no-xfixes,libxfixes"
106PACKAGECONFIG[xrandr] = "-xrandr,-no-xrandr,libxrandr"
107PACKAGECONFIG[xrender] = "-xrender,-no-xrender,libxrender" 102PACKAGECONFIG[xrender] = "-xrender,-no-xrender,libxrender"
108PACKAGECONFIG[xshape] = "-xshape,-no-xshape"
109PACKAGECONFIG[xsync] = "-xsync,-no-xsync"
110PACKAGECONFIG[openvg] = "-openvg,-no-openvg"
111PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" 103PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv"
112PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" 104PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon"
113PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config" 105PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config"
@@ -118,13 +110,11 @@ PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig"
118PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+" 110PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+"
119PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" 111PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
120PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" 112PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
121PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" 113PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
122PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" 114PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/mesa"
123PACKAGECONFIG[icu] = "-icu,-no-icu,icu" 115PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
124PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" 116PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
125PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" 117PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
126PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib"
127PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio"
128PACKAGECONFIG[widgets] = "-widgets,-no-widgets" 118PACKAGECONFIG[widgets] = "-widgets,-no-widgets"
129PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" 119PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy"
130PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" 120PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput"
@@ -139,44 +129,10 @@ QT_CONFIG_FLAGS += " \
139 ${PACKAGECONFIG_CONFARGS} \ 129 ${PACKAGECONFIG_CONFARGS} \
140" 130"
141 131
142do_generate_qt_config_file_append() {
143 cat >> ${QT_CONF_PATH} <<EOF
144
145[EffectivePaths]
146Prefix=..
147EOF
148}
149
150# qtbase is exception, we need to use mkspecs from ${S}
151QMAKE_MKSPEC_PATH = "${B}"
152
153# another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location
154OE_QMAKE_QMAKE_ORIG := "${OE_QMAKE_QMAKE}"
155OE_QMAKE_QMAKE = "bin/qmake"
156
157# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell
158export OE_QMAKE_COMPILER
159export OE_QMAKE_CC
160export OE_QMAKE_CFLAGS
161export OE_QMAKE_CXX
162export OE_QMAKE_CXXFLAGS
163export OE_QMAKE_LINK
164export OE_QMAKE_LDFLAGS
165export OE_QMAKE_AR
166export OE_QMAKE_STRIP
167
168do_configure() { 132do_configure() {
169 # we need symlink in path relative to source, because
170 # EffectivePaths:Prefix is relative to qmake location
171 if [ ! -e ${B}/bin/qmake ]; then
172 mkdir -p ${B}/bin
173 ln -sf ${OE_QMAKE_QMAKE_ORIG} ${B}/bin/qmake
174 fi
175
176 ${S}/configure -v \ 133 ${S}/configure -v \
177 -opensource -confirm-license \ 134 -opensource -confirm-license \
178 -sysroot ${STAGING_DIR_TARGET} \ 135 -sysroot ${STAGING_DIR_TARGET} \
179 -no-gcc-sysroot \
180 -prefix ${OE_QMAKE_PATH_PREFIX} \ 136 -prefix ${OE_QMAKE_PATH_PREFIX} \
181 -bindir ${OE_QMAKE_PATH_BINS} \ 137 -bindir ${OE_QMAKE_PATH_BINS} \
182 -libdir ${OE_QMAKE_PATH_LIBS} \ 138 -libdir ${OE_QMAKE_PATH_LIBS} \
@@ -192,37 +148,29 @@ do_configure() {
192 -translationdir ${OE_QMAKE_PATH_TRANSLATIONS} \ 148 -translationdir ${OE_QMAKE_PATH_TRANSLATIONS} \
193 -testsdir ${OE_QMAKE_PATH_TESTS} \ 149 -testsdir ${OE_QMAKE_PATH_TESTS} \
194 -examplesdir ${OE_QMAKE_PATH_EXAMPLES} \ 150 -examplesdir ${OE_QMAKE_PATH_EXAMPLES} \
151 -hostprefix ${OE_QMAKE_PATH_HOST_PREFIX} \
152 -hostlibdir ${OE_QMAKE_PATH_HOST_LIBS} \
195 -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ 153 -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \
196 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ 154 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
197 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ 155 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \
198 -platform ${OE_QMAKESPEC} \ 156 -platform ${OE_QMAKE_PLATFORM_NATIVE} \
199 -xplatform linux-oe-g++ \ 157 -xplatform linux-oe-g++ \
200 ${QT_CONFIG_FLAGS} 158 ${QT_CONFIG_FLAGS}
201
202 qmake5_base_do_configure
203} 159}
204 160
205do_install_append() { 161do_install_append() {
206 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" 162 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory"
207 touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri 163 touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri
208 164
209 install -m 0755 ${B}/bin/qmake-target ${D}${OE_QMAKE_PATH_QT_BINS}/qmake
210
211 # Remove example.pro file as it is useless
212 rm -f ${D}${OE_QMAKE_PATH_EXAMPLES}/examples.pro
213
214 # Remove macx-ios-clang directory because /usr/lib/qt5/mkspecs/macx-ios-clang/rename_main.sh:#!/bin/bash
215 # triggers QA Issue: qtbase-mkspecs requires /bin/bash, but no providers in its RDEPENDS [file-rdeps]
216 rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang
217 # and this one has /bin/bash shebang, but checkbashisms doesn't show any reason for it
218 sed -i 's@^#!/bin/bash$@#!/bin/sh@g' ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/data/mac/objc_namespace.sh
219
220 # Replace host paths with qmake built-in properties 165 # Replace host paths with qmake built-in properties
221 sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX]|g' \ 166 sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \
222 -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ 167 -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
223 ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri 168 ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri
224} 169}
225 170
171# mkspecs have mac specific scripts that depend on perl and bash
172INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
173
226RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 174RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
227 175
228SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd" 176SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 8cf316bf..3ca66472 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -3,11 +3,11 @@ require qt5-git.inc
3 3
4LICENSE = "LGPL-3.0 | GPL-3.0" 4LICENSE = "LGPL-3.0 | GPL-3.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 6 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
7 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 7 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
8 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 8 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
9" 9"
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "1568c60d2a0d1758acfeec9f002af7ff5b4d28ee" 13SRCREV = "5962967a3712ee711fd9ab58da664a3eb0acb24e"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 21f6f139..1369deee 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "03a6177a3223f928a5f329c8b1fc4d5fe376deed" 11SRCREV = "057b3e2d6a96b42b890a0d007a8801d260c3de48"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 67f882ad..de7764d8 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,13 +19,8 @@ DEPENDS += "qtbase qtdeclarative"
19inherit bluetooth 19inherit bluetooth
20 20
21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" 21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
22PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" 22PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
23 23
24EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 24EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
25 25
26do_configure_prepend() { 26SRCREV = "1afb57ed92a25bbc000ea4c4d7662cb8b9e267ee"
27 # disable bluez test if it isn't enabled by PACKAGECONFIG
28 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
29}
30
31SRCREV = "8755a1f2460fa523782e27b6ca7a430a0176ac61"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 50a0bcc6..7d6a51fc 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "d6a8da66dc3c141621c9be4b7509a6e43c60e15c" 11SRCREV = "a78f8d6bef57dd4283094a52551705ee02909970"
diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb
deleted file mode 100644
index cb2ee8bb..00000000
--- a/recipes-qt/qt5/qtdeclarative-render2d_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require qt5.inc
2require qt5-git.inc
3
4LICENSE = "GPL-3.0 | The-Qt-Company-TPLA-2.4"
5LIC_FILES_CHKSUM = " \
6 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
7 file://LICENSE.PREVIEW.COMMERCIAL;md5=c458c2ae1b463cca5219eaee54f6287e \
8"
9
10DEPENDS += "qtbase qtdeclarative"
11
12SRCREV = "13a6c51f26128015c0a3c335bdae676b46df6ed6"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
deleted file mode 100644
index b71e3a4b..00000000
--- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1From 0d742f34ef91fb4e35c68b1274f68daef594f0c3 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH] qmltestexample: fix link
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get :
10ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found
11
12Upstream-Status: Inappropriate
13
14Change-Id: I63088ff73bec6a8559dfae132f8bd40b62487450
15Signed-off-by: Eric Bénard <eric@eukrea.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 examples/qmltest/qmltest/qmltest.pro | 2 +-
19 tests/auto/qml/qjsengine/qjsengine.pro | 2 +-
20 tests/auto/qmltest/qmltest.pro | 1 +
21 tools/qmltestrunner/qmltestrunner.pro | 2 +-
22 4 files changed, 4 insertions(+), 3 deletions(-)
23
24diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
25index b5893c5..1b00e6c 100644
26--- a/examples/qmltest/qmltest/qmltest.pro
27+++ b/examples/qmltest/qmltest/qmltest.pro
28@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml
29 # This code exists solely for the purpose of building this example
30 # inside the examples/ hierarchy.
31
32-QT += qml qmltest
33+QT += qml qmltest quick
34
35 macx: CONFIG -= app_bundle
36
37diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro
38index c9d78e2..5861613 100644
39--- a/tests/auto/qml/qjsengine/qjsengine.pro
40+++ b/tests/auto/qml/qjsengine/qjsengine.pro
41@@ -1,6 +1,6 @@
42 CONFIG += testcase
43 TARGET = tst_qjsengine
44-QT += qml qml-private widgets testlib gui-private
45+QT += qml qml-private widgets testlib gui-private quick
46 macx:CONFIG -= app_bundle
47 SOURCES += tst_qjsengine.cpp
48 RESOURCES += qjsengine.qrc
49diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
50index 52fd6bf..843cae6 100644
51--- a/tests/auto/qmltest/qmltest.pro
52+++ b/tests/auto/qmltest/qmltest.pro
53@@ -4,6 +4,7 @@ CONFIG += qmltestcase
54 CONFIG += console
55 SOURCES += tst_qmltest.cpp
56
57+QT += quick
58
59 importFiles.files = borderimage buttonclick createbenchmark events qqmlbinding selftests
60
61diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
62index 1bb913e..56f2dd5 100644
63--- a/tools/qmltestrunner/qmltestrunner.pro
64+++ b/tools/qmltestrunner/qmltestrunner.pro
65@@ -1,6 +1,6 @@
66 SOURCES += main.cpp
67
68-QT += qml qmltest
69+QT += qml qmltest quick
70 CONFIG += no_import_scan
71
72 load(qt_tool)
diff --git a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
deleted file mode 100644
index d0d0f8e0..00000000
--- a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 6b1cef42f828cd2374739aa7e3b3800d579315d6 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Thu, 31 Mar 2016 19:38:58 -0400
4Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been
5 declared error
6
7Upstream-Status: Pending
8
9Signed-off-by: Denys Dmytriyenko <denys@ti.com>
10---
11 examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h
15index 5b86c93..e77514e 100644
16--- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h
17+++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h
18@@ -44,6 +44,7 @@
19 #include <QWidget>
20 #include <QQuickWidget>
21 #include <QQuickView>
22+#include <QCoreApplication>
23
24 QT_FORWARD_DECLARE_CLASS(QRadioButton)
25 QT_FORWARD_DECLARE_CLASS(QCheckBox)
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch b/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch
deleted file mode 100644
index d3ee42ef..00000000
--- a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Wed, 24 Aug 2016 11:18:37 +1000
4Subject: [PATCH] Workaround crashes in QtQml code related to dead-store
5 elimination
6
7When compiled in release mode with GCC 6, QtQml may crash.
8This is because the C++ compiler is more aggressive about dead-store
9elimination in situations where a memory store to a location precedes
10the construction of an object at that memory location.
11
12The QV4::MemoryManager::allocate{Managed,Object} functions allocate
13memory and write to it before the caller does a placement new to
14construct an object in the same memory. The compiler considers these
15writes before the constructor as "dead stores" and eliminates them.
16
17The -fno-lifetime-dse compiler flag is added to disable this more
18aggressive dead-store eliminiation optimization.
19
20This is a temporary workaround until a proper solution is found.
21
22Upstream-Status: Accepted
23
24Task-number: QTBUG-55482
25Change-Id: I7dbae6e9e613e53ce5fb25957c449bc6657803b5
26Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
27Signed-off-by: Jonathan Liu <net147@gmail.com>
28---
29 src/qml/qml.pro | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-)
31
32diff --git a/src/qml/qml.pro b/src/qml/qml.pro
33index f4862a1..651afa6 100644
34--- a/src/qml/qml.pro
35+++ b/src/qml/qml.pro
36@@ -18,7 +18,7 @@ exists("qqml_enable_gcov") {
37
38 greaterThan(QT_GCC_MAJOR_VERSION, 5) {
39 # Our code is bad. Temporary workaround.
40- QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
41+ QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse
42 }
43
44 QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 2633be7e..a620a00a 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -16,14 +16,6 @@ LIC_FILES_CHKSUM = " \
16 16
17DEPENDS += "qtbase" 17DEPENDS += "qtbase"
18 18
19SRC_URI += " \
20 file://0001-qmltestexample-fix-link.patch \
21 file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \
22 file://0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch \
23"
24
25EXTRA_OEMAKE += "QMAKE_SYNCQT=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt"
26
27PACKAGECONFIG ??= "qtxmlpatterns" 19PACKAGECONFIG ??= "qtxmlpatterns"
28PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" 20PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns"
29 21
@@ -31,13 +23,15 @@ do_configure_prepend() {
31 # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG 23 # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG
32 sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro 24 sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro
33 sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro 25 sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro
26}
34 27
35 #set the path for syncqt properly 28do_install_append_class-nativesdk() {
36 echo "QT_TOOL.syncqt.binary = \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt\"" > ${B}/.qmake.cache 29 # qml files not needed in nativesdk
30 rm -rf ${D}${OE_QMAKE_PATH_QML}
37} 31}
38 32
39EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
40 34
41SRCREV = "d48b397cc79265e80c8437888f9ded0b0364e418" 35SRCREV = "fffb997e192a72b4dcd66edc2fbad5473dd359f3"
42 36
43BBCLASSEXTEND =+ "native nativesdk" 37BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index e77d358c..2f32a884 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 13DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
14 14
15SRCREV = "cedca298f081e1c1cdac615eed6171fe687f35e2" 15QT_MODULE_BRANCH = "dev"
16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
16 17
17do_install_append() { 18do_install_append() {
18 if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then 19 if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
new file mode 100644
index 00000000..6abf8b77
--- /dev/null
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -0,0 +1,17 @@
1require qt5.inc
2require qt5-git.inc
3
4LICENSE = "GPL-3.0 | LGPL-3.0 | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
7 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
8"
9
10DEPENDS += "qtbase qtxmlpatterns qtdeclarative"
11
12PACKAGECONFIG ??= "sdl2"
13PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16
17SRCREV = "13bbe6ea378d127b9b1d70e2858e41e86e754dc7"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 6c62a683..f4b43e75 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -4,13 +4,13 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 12 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
13 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
16" 16"
@@ -19,4 +19,4 @@ DEPENDS += "qtdeclarative"
19 19
20RDEPENDS_${PN}-dev = "" 20RDEPENDS_${PN}-dev = ""
21 21
22SRCREV = "d3023be0d839440ac046adf2af75d9e4306dd5ef" 22SRCREV = "1583bb5569cfc50141d879107a46146d5ccccf28"
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
deleted file mode 100644
index 03432c9e..00000000
--- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 7eb3fddc70871048f170211a88194c8cdeeca4dd Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 4 Aug 2014 19:19:05 +0200
4Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 qtimageformats.pro | 8 ++++----
9 1 file changed, 4 insertions(+), 4 deletions(-)
10
11diff --git a/qtimageformats.pro b/qtimageformats.pro
12index 8382e5c..63d13ce 100644
13--- a/qtimageformats.pro
14+++ b/qtimageformats.pro
15@@ -1,9 +1,9 @@
16 requires(qtHaveModule(gui))
17
18 load(configure)
19-qtCompileTest(jasper)
20-qtCompileTest(libmng)
21-qtCompileTest(libtiff)
22-qtCompileTest(libwebp)
23+OE_JASPER_ENABLED:qtCompileTest(jasper)
24+OE_LIBMNG_ENABLED:qtCompileTest(libmng)
25+OE_LIBTIFF_ENABLED:qtCompileTest(libtiff)
26+OE_LIBWEBP_ENABLED:qtCompileTest(libwebp)
27
28 load(qt_parts)
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 7f8179e1..3725441c 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -4,32 +4,26 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 12 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
13 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
16" 16"
17 17
18DEPENDS += "qtbase" 18DEPENDS += "qtbase"
19ALLOW_EMPTY_${PN} = "1"
20
21SRC_URI += "file://0001-qtimageformats.pro-Make-the-dependencies-determinist.patch"
22 19
23PACKAGECONFIG ?= "libtiff" 20PACKAGECONFIG ?= "libtiff"
24# Currently we don't have recipe for libmng, but lock it anyway so qtimageformats stay deterministic even when libmng is introduced 21# Currently we don't have recipe for libmng, but lock it anyway so qtimageformats stay deterministic even when libmng is introduced
25PACKAGECONFIG[jasper] = ",,jasper" 22PACKAGECONFIG[jasper] = ",CONFIG+=done_config_jasper,jasper"
26PACKAGECONFIG[libmng] = ",,libmng" 23PACKAGECONFIG[libmng] = ",CONFIG+=done_config_libmng,libmng"
27PACKAGECONFIG[libtiff] = ",,tiff" 24PACKAGECONFIG[libtiff] = ",CONFIG+=done_config_libtiff,tiff"
28PACKAGECONFIG[libwebp] = ",,libwebp" 25PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
29 26
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libmng', 'CONFIG+=OE_LIBMNG_ENABLED', '', d)}" 27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_JASPER_ENABLED', '', d)}"
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
34 28
35SRCREV = "d4401c9f519dfe82c38fe9ded674e454655f1866" 29SRCREV = "cd2de115c6216ad747cf4803e65a4ce4af220795"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 7a9ecb47..f25d57ef 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -3,30 +3,21 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" 4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
15 15
16PACKAGECONFIG ??= "" 16PACKAGECONFIG ??= ""
17# older geoclue 0.x is needed 17# older geoclue 0.12.99 is needed
18PACKAGECONFIG[geoclue] = "OE_GEOCLUE_ENABLED,,gconf geoclue" 18PACKAGECONFIG[geoclue] = ",,geoclue"
19PACKAGECONFIG[gypsy] = "OE_GYPSY_ENABLED,,gconf gypsy" 19PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy"
20 20
21do_configure_prepend() { 21EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
22 # disable geoclue tests if it isn't enabled by PACKAGECONFIG
23 sed -i -e 's/^\(qtCompileTest(geoclue)\)/OE_GEOCLUE_ENABLED:\1/' ${S}/qtlocation.pro
24 sed -i -e 's/^\(qtCompileTest(geoclue-satellite)\)/OE_GEOCLUE_ENABLED:\1/' ${S}/qtlocation.pro
25 # disable gypsy test if it isn't enabled by PACKAGECONFIG
26 sed -i -e 's/^\(qtCompileTest(gypsy)\)/OE_GYPSY_ENABLED:\1/' ${S}/qtlocation.pro
27}
28 22
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 23SRCREV = "41cc347040226d2c5c16b9df001d03f2724b87e5"
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31
32SRCREV = "4e1008b4ac1eea776585ca41a6a3db127cf500ff"
diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
deleted file mode 100644
index fa6b5852..00000000
--- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 26fd6cf787a7a413d54205b8b42d16a63ed5d36a Mon Sep 17 00:00:00 2001
2From: Yoann Lopes <yoann.lopes@digia.com>
3Date: Thu, 31 Oct 2013 15:06:30 +0100
4Subject: [PATCH] Initial porting effort to GStreamer 1.0.
5
6* It's already included in 5.5 with this commit:
7 commit 108dda7a90bd0f0337358b0db47ae55acd16dea6
8 Author: Yoann Lopes <yoann.lopes@theqtcompany.com>
9 Date: Thu Nov 20 17:54:18 2014 +0100
10 GStreamer: port to 1.0.
11* here we restore only the done_config_gstreamer variable
12 to explicitly disable it from OE build
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 qtmultimedia.pro | 26 ++++++++++++++------------
17 1 file changed, 14 insertions(+), 12 deletions(-)
18
19diff --git a/qtmultimedia.pro b/qtmultimedia.pro
20index 98bb315..287887f 100644
21--- a/qtmultimedia.pro
22+++ b/qtmultimedia.pro
23@@ -17,19 +17,21 @@ win32 {
24 contains(QT_CONFIG, alsa):qtCompileTest(alsa)
25 contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
26
27- isEmpty(GST_VERSION) {
28- contains(QT_CONFIG, gstreamer-0.10) {
29- GST_VERSION = 0.10
30- } else: contains(QT_CONFIG, gstreamer-1.0) {
31- GST_VERSION = 1.0
32+ !done_config_gstreamer {
33+ isEmpty(GST_VERSION) {
34+ contains(QT_CONFIG, gstreamer-0.10) {
35+ GST_VERSION = 0.10
36+ } else: contains(QT_CONFIG, gstreamer-1.0) {
37+ GST_VERSION = 1.0
38+ }
39+ }
40+ cache(GST_VERSION, set)
41+ !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
42+ qtCompileTest(gstreamer_photography)
43+ qtCompileTest(gstreamer_encodingprofiles)
44+ qtCompileTest(gstreamer_appsrc)
45+ qtCompileTest(linux_v4l)
46 }
47- }
48- cache(GST_VERSION, set)
49- !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
50- qtCompileTest(gstreamer_photography)
51- qtCompileTest(gstreamer_encodingprofiles)
52- qtCompileTest(gstreamer_appsrc)
53- qtCompileTest(linux_v4l)
54 }
55
56 qtCompileTest(resourcepolicy)
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 245f1063..7d3c3cc0 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -18,25 +18,19 @@ DEPENDS += "qtdeclarative"
18 18
19PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 19PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 20 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
21PACKAGECONFIG[alsa] = ",,alsa-lib" 21PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib"
22PACKAGECONFIG[pulseaudio] = ",,pulseaudio" 22PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio"
23PACKAGECONFIG[openal] = ",,openal-soft" 23PACKAGECONFIG[openal] = "-feature-openal,-no-feature-openal,openal-soft"
24PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" 24PACKAGECONFIG[gstreamer] = "-gstreamer 1.0,,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
25PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad" 25PACKAGECONFIG[gstreamer010] = "-gstreamer 0.10,,gstreamer gst-plugins-base gst-plugins-bad"
26 26
27EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}" 27EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}"
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'openal', '', 'CONFIG+=done_config_openal', d)}"
30 28
31# Handles GStreamer support
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer', 'GST_VERSION=1.0', '', d)}"
33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', '', d)}"
34# Disable GStreamer if completely disabled 29# Disable GStreamer if completely disabled
35EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}" 30EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
36 31
37SRC_URI += "\ 32SRC_URI += "\
38 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
39 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ 33 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
40" 34"
41 35
42SRCREV = "1be4f74843b41f8bc1d1d64e83485f4eb864e8b4" 36SRCREV = "544a8a4251ff9694780e563ddb6e4af1325e0115"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
new file mode 100644
index 00000000..5657c869
--- /dev/null
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -0,0 +1,13 @@
1LICENSE = "BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
2LIC_FILES_CHKSUM = " \
3 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
4 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
5 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
6"
7
8require qt5.inc
9require qt5-git.inc
10
11DEPENDS += "qtbase"
12
13SRCREV = "ec7663382bc6382323f3261ab199ec2edbeb5e37"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 4107c3a3..e9b6185e 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ 8 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 11"
@@ -23,4 +22,5 @@ do_configure_prepend() {
23 sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro 22 sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro
24} 23}
25 24
26SRCREV = "857fc5ec4644a6111ba8725e4e1a84dd5ea6bfca" 25QT_MODULE_BRANCH = "dev"
26SRCREV = "64faeb0d8003e699a4d09e7dcee1ef6eb10302ad"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 7271a19a..42acb8ad 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -4,10 +4,10 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" 4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
7 file://LICENSE.LGPLv3;md5=8ba7f2099d17d636d5fcc8303bb17587 \ 7 file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9" 9"
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "cc0ee8e4f3345023f1b85fc815739c0a75ea5686" 13SRCREV = "6f7852a307c7ebbdb3b6efa00cbf7626b072bbc1"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 176035c0..69f3d3ba 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -4,12 +4,12 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 8 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
10 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 10 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
14" 14"
15 15
@@ -21,4 +21,4 @@ SRC_URI += " \
21 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 21 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
22" 22"
23 23
24SRCREV = "37f8b753be1b16975220c8b611b17a428eafb9e9" 24SRCREV = "201c86391c7ff78d570fdec6e0c0b71eb1e9aae4"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index bee833dd..3f8b64a2 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
25 25
26DEPENDS += "qtbase" 26DEPENDS += "qtbase"
27 27
28SRCREV = "b8845794b95376e8be39dbdafca2c85b5ec4c195" 28SRCREV = "c35df2ec0ee05351912e768d298a7c627dbdd1ef"
diff --git a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch
new file mode 100644
index 00000000..0b90a66b
--- /dev/null
+++ b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch
@@ -0,0 +1,28 @@
1From 210049f0e53f7fb8e5c44325b13947add9618f89 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 10 Jan 2017 15:28:26 +0200
4Subject: [PATCH] Use external host bin path for cmake file
5
6Need to use ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} for cmake to find the
7qscxmlc tool from correct sysroot path.
8
9Upstream-Status: Inappropriate [OE specific]
10Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
11Change-Id: Idb814be705e9cbaad7f1e68b5d7cdb79c4b65008
12---
13 src/scxml/Qt5ScxmlConfigExtras.cmake.in | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/scxml/Qt5ScxmlConfigExtras.cmake.in b/src/scxml/Qt5ScxmlConfigExtras.cmake.in
17index edb320a..c2f8be8 100644
18--- a/src/scxml/Qt5ScxmlConfigExtras.cmake.in
19+++ b/src/scxml/Qt5ScxmlConfigExtras.cmake.in
20@@ -40,7 +40,7 @@ if (NOT TARGET Qt5::qscxmlc)
21 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
22 set(imported_location \"${_qt5Scxml_install_prefix}/$${CMAKE_BIN_DIR}qscxmlc$$CMAKE_BIN_SUFFIX\")
23 !!ELSE
24- set(imported_location \"$${CMAKE_BIN_DIR}qscxmlc$$CMAKE_BIN_SUFFIX\")
25+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qscxmlc$$CMAKE_BIN_SUFFIX\")
26 !!ENDIF
27 _qt5_Scxml_check_file_exists(${imported_location})
28
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
new file mode 100644
index 00000000..d69d00fe
--- /dev/null
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -0,0 +1,22 @@
1LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
2LIC_FILES_CHKSUM = " \
3 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
4 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
5 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
6"
7
8require qt5.inc
9require qt5-git.inc
10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12
13SRCREV = "4704292500b98143eee9b0fb0b6a34a858ed1253"
14
15SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
16
17do_install_append_class-nativesdk() {
18 # qml files not needed in nativesdk
19 rm -rf ${D}${OE_QMAKE_PATH_QML}
20}
21
22BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index af45d89a..93a09719 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -3,14 +3,14 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase qtdeclarative" 14DEPENDS += "qtbase qtdeclarative"
15 15
16SRCREV = "e03c37077ea4841b9e0b591d29a34737d7d8dd32" 16SRCREV = "1220a31e6c2f91b34b4a05773621dddab8c4315a"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 397ac4e9..325d9754 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "88554d068d287870740b842864a50604f53e8509" 14SRCREV = "c8fe92ef54b2d310e8c8c143962fd6f43bf46c27"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index d5f37d5f..edecc041 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -5,14 +5,14 @@ require qt5-git.inc
5# other qt* components use :/ 5# other qt* components use :/
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 8 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 9 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ 11 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
12 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ 12 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
13 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 13 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
14" 14"
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "7346857f4f675f57572d54f15cfad9111af2abde" 18SRCREV = "74aad2578ecb6739007449a06a54dd7abd64c85b"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 21e06ff6..24a0d911 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -3,13 +3,13 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11" 11"
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "64ca369c7e3d61f0416bc1fd6a102f0c62924433" 15SRCREV = "1b3a7ae14d25f1caa3f6bedad3cfeb7d83b3904e"
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
deleted file mode 100644
index 94cd0484..00000000
--- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ /dev/null
@@ -1,158 +0,0 @@
1From 68ecc4f25789321fc29ec9e4981fcfa27e706f1c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert
5
6This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
7is built without GUI support (no-png is set) and we still want to build
8native lrelease + lupdate + lconvert tools.
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 examples/examples.pro | 3 ++-
15 src/designer/src/src.pro | 18 ++++++++++--------
16 src/linguist/linguist.pro | 2 +-
17 src/src.pro | 16 +++++++++-------
18 tests/auto/auto.pro | 24 +++++++++++++-----------
19 5 files changed, 35 insertions(+), 28 deletions(-)
20
21diff --git a/examples/examples.pro b/examples/examples.pro
22index 69365d1..da7b38b 100644
23--- a/examples/examples.pro
24+++ b/examples/examples.pro
25@@ -1,4 +1,5 @@
26 TEMPLATE = subdirs
27-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
28+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant
29+qtHaveModule(widgets): SUBDIRS += linguist uitools
30
31 winrt: SUBDIRS -= assistant designer
32diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
33index 6915e34..3ff2eca 100644
34--- a/src/designer/src/src.pro
35+++ b/src/designer/src/src.pro
36@@ -1,13 +1,15 @@
37 TEMPLATE = subdirs
38
39-SUBDIRS = \
40- uiplugin \
41- uitools \
42- lib \
43- components \
44- designer
45+!linguistonly {
46+ SUBDIRS = \
47+ uiplugin \
48+ lib \
49+ components \
50+ designer
51+}
52+SUBDIRS += uitools
53
54-contains(QT_CONFIG, shared): SUBDIRS += plugins
55+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
56
57 uitools.depends = uiplugin
58 lib.depends = uiplugin
59@@ -15,7 +17,7 @@ components.depends = lib
60 designer.depends = components
61 plugins.depends = lib
62
63-qtNomakeTools( \
64+!linguistonly:qtNomakeTools( \
65 lib \
66 components \
67 designer \
68diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
69index 3a70580..a977878 100644
70--- a/src/linguist/linguist.pro
71+++ b/src/linguist/linguist.pro
72@@ -3,7 +3,7 @@ SUBDIRS = \
73 lrelease \
74 lupdate \
75 lconvert
76-!no-png:qtHaveModule(widgets): SUBDIRS += linguist
77+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist
78
79 qtNomakeTools( \
80 linguist \
81diff --git a/src/src.pro b/src/src.pro
82index 387d54f..56b7d0c 100644
83--- a/src/src.pro
84+++ b/src/src.pro
85@@ -4,19 +4,21 @@ qtHaveModule(widgets) {
86 no-png {
87 message("Some graphics-related tools are unavailable without PNG support")
88 } else {
89- SUBDIRS = assistant \
90+ !linguistonly {
91+ SUBDIRS = assistant \
92 pixeltool \
93- qtestlib \
94- designer
95+ qtestlib
96+ }
97+ SUBDIRS += designer
98
99 linguist.depends = designer
100 }
101 }
102
103 SUBDIRS += linguist \
104- qdoc \
105 qtplugininfo
106-if(!android|android_app):!ios: SUBDIRS += qtpaths
107+!linguistonly: SUBDIRS += qdoc
108+if(!android|android_app):!ios:!linguistonly: SUBDIRS += qtpaths
109
110 mac {
111 SUBDIRS += macdeployqt
112@@ -26,11 +28,11 @@ android {
113 SUBDIRS += androiddeployqt
114 }
115
116-qtHaveModule(dbus): SUBDIRS += qdbus
117+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
118
119 win32|winrt:SUBDIRS += windeployqt
120 winrt:SUBDIRS += winrtrunner
121-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
122+!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
123
124 qtNomakeTools( \
125 pixeltool \
126diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
127index 20b5fec..8a42d1f 100644
128--- a/tests/auto/auto.pro
129+++ b/tests/auto/auto.pro
130@@ -1,15 +1,17 @@
131 TEMPLATE=subdirs
132-SUBDIRS=\
133- linguist \
134- qhelpcontentmodel \
135- qhelpenginecore \
136- qhelpgenerator \
137- qhelpindexmodel \
138- qhelpprojectdata \
139- cmake \
140- installed_cmake \
141- qtdiag \
142- windeployqt
143+!linguistonly {
144+ SUBDIRS=\
145+ linguist \
146+ qhelpcontentmodel \
147+ qhelpenginecore \
148+ qhelpgenerator \
149+ qhelpindexmodel \
150+ qhelpprojectdata \
151+ cmake \
152+ installed_cmake \
153+ qtdiag \
154+ windeployqt
155+}
156
157 installed_cmake.depends = cmake
158
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 56c1205b..a2b01be9 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -17,7 +17,6 @@ LIC_FILES_CHKSUM = " \
17DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 17DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
18 18
19SRC_URI += " \ 19SRC_URI += " \
20 file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch \
21 file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \ 20 file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
22 file://0003-add-noqtwebkit-configuration.patch \ 21 file://0003-add-noqtwebkit-configuration.patch \
23 file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \ 22 file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \
@@ -27,14 +26,10 @@ FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks"
27FILES_${PN}-examples = "${datadir}${QT_DIR_NAME}/examples" 26FILES_${PN}-examples = "${datadir}${QT_DIR_NAME}/examples"
28 27
29PACKAGECONFIG ??= "" 28PACKAGECONFIG ??= ""
30PACKAGECONFIG_class-native ??= "linguistonly"
31PACKAGECONFIG_class-nativesdk ??= "linguistonly"
32PACKAGECONFIG[linguistonly] = ""
33PACKAGECONFIG[qtwebkit] = ",,qtwebkit" 29PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
34 30
35EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
36EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
37 32
38SRCREV = "0597b535f82d3458a1db1828c5e5f725bbcf59fd" 33SRCREV = "30c10900adecca55faa1d59c2f0caac74b1f9df6"
39 34
40BBCLASSEXTEND = "native nativesdk" 35BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 2a37d144..53ab1996 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \
114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
115" 115"
116 116
117SRCREV = "2209b3fd6a56bfc44da5369c4fbd345bbca31777" 117SRCREV = "c0ae29b2328922f16cb2305f8579c2a869c871b0"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 7e2f445e..08914b19 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -33,6 +33,7 @@ PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR"
33PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO" 33PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO"
34PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL" 34PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL"
35PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT" 35PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT"
36PACKAGECONFIG[lang-ro_RO] = "CONFIG+=lang-ro_RO"
36PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU" 37PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU"
37PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE" 38PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE"
38PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN" 39PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN"
@@ -48,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
48 49
49DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
50 51
51SRCREV = "626e78c9660cff063e1f9370538b5a424631571c" 52SRCREV = "cfa4ab4cbf13971d4b71ee920353822755a3bf31"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
deleted file mode 100644
index 1149aa5b..00000000
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
1require qt5-native.inc
2require qt5-git.inc
3
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
15"
16
17DEPENDS = "qtbase-native wayland-native"
18
19SRC_URI += " \
20 file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \
21 file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \
22"
23
24do_configure() {
25 ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}/src/qtwaylandscanner
26}
27
28do_install() {
29 oe_runmake install INSTALL_ROOT=${D}
30}
31
32SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941"
diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
deleted file mode 100644
index d173e673..00000000
--- a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
+++ /dev/null
@@ -1,156 +0,0 @@
1From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <dachaac@gmail.com>
3Date: Sun, 18 Sep 2016 11:51:59 +0300
4Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5 features are
5 disabled.
6
7QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL,
8QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and
9QT_NO_SESSIONMANAGER, these has to be taken into account when compiling
10QtWayland.
11---
12 src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++---
13 src/client/qwaylandintegration_p.h | 12 ++++++++++++
14 2 files changed, 30 insertions(+), 3 deletions(-)
15
16diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
17index 39fff53..481e3d6 100644
18--- a/src/client/qwaylandintegration.cpp
19+++ b/src/client/qwaylandintegration.cpp
20@@ -39,7 +39,9 @@
21 #include "qwaylandinputcontext_p.h"
22 #include "qwaylandshmbackingstore_p.h"
23 #include "qwaylandnativeinterface_p.h"
24+#ifndef QT_NO_CLIPBOARD
25 #include "qwaylandclipboard_p.h"
26+#endif
27 #include "qwaylanddnd_p.h"
28 #include "qwaylandwindowmanagerintegration_p.h"
29 #include "qwaylandscreen_p.h"
30@@ -57,7 +59,9 @@
31 #include <QSocketNotifier>
32
33 #include <qpa/qplatforminputcontextfactory_p.h>
34+#ifndef QT_NO_ACCESSIBILITY
35 #include <qpa/qplatformaccessibility.h>
36+#endif
37 #include <qpa/qplatforminputcontext.h>
38
39 #include "qwaylandhardwareintegration_p.h"
40@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration()
41 , mNativeInterface(new QWaylandNativeInterface(this))
42 #ifndef QT_NO_ACCESSIBILITY
43 , mAccessibility(new QPlatformAccessibility())
44-#else
45- , mAccessibility(0)
46 #endif
47 , mClientBufferIntegrationInitialized(false)
48 , mServerBufferIntegrationInitialized(false)
49@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration()
50 {
51 initializeInputDeviceIntegration();
52 mDisplay = new QWaylandDisplay(this);
53+#ifndef QT_NO_CLIPBOARD
54 mClipboard = new QWaylandClipboard(mDisplay);
55+#endif
56+#ifndef QT_NO_DRAGANDDROP
57 mDrag = new QWaylandDrag(mDisplay);
58-
59+#endif
60 QString icStr = QPlatformInputContextFactory::requested();
61 icStr.isNull() ? mInputContext.reset(new QWaylandInputContext(mDisplay))
62 : mInputContext.reset(QPlatformInputContextFactory::create(icStr));
63@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration()
64
65 QWaylandIntegration::~QWaylandIntegration()
66 {
67+#ifndef QT_NO_DRAGANDDROP
68 delete mDrag;
69+#endif
70+#ifndef QT_NO_CLIPBOARD
71 delete mClipboard;
72+#endif
73 #ifndef QT_NO_ACCESSIBILITY
74 delete mAccessibility;
75 #endif
76@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const
77 return mFontDb;
78 }
79
80+#ifndef QT_NO_CLIPBOARD
81 QPlatformClipboard *QWaylandIntegration::clipboard() const
82 {
83 return mClipboard;
84 }
85+#endif
86
87+#ifndef QT_NO_DRAGANDDROP
88 QPlatformDrag *QWaylandIntegration::drag() const
89 {
90 return mDrag;
91 }
92+#endif
93
94 QPlatformInputContext *QWaylandIntegration::inputContext() const
95 {
96@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const
97 return QPlatformIntegration::styleHint(hint);
98 }
99
100+#ifndef QT_NO_ACCESSIBILITY
101 QPlatformAccessibility *QWaylandIntegration::accessibility() const
102 {
103 return mAccessibility;
104 }
105+#endif
106
107 QPlatformServices *QWaylandIntegration::services() const
108 {
109diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
110index 987d805..b50ad95 100644
111--- a/src/client/qwaylandintegration_p.h
112+++ b/src/client/qwaylandintegration_p.h
113@@ -80,15 +80,21 @@ public:
114
115 QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
116
117+#ifndef QT_NO_CLIPBOARD
118 QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
119+#endif
120
121+#ifndef QT_NO_DRAGANDDROP
122 QPlatformDrag *drag() const Q_DECL_OVERRIDE;
123+#endif
124
125 QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
126
127 QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
128
129+#ifndef QT_NO_ACCESSIBILITY
130 QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
131+#endif
132
133 QPlatformServices *services() const Q_DECL_OVERRIDE;
134
135@@ -117,12 +123,18 @@ private:
136 void initializeInputDeviceIntegration();
137
138 QPlatformFontDatabase *mFontDb;
139+#ifndef QT_NO_CLIPBOARD
140 QPlatformClipboard *mClipboard;
141+#endif
142+#ifndef QT_NO_DRAGANDDROP
143 QPlatformDrag *mDrag;
144+#endif
145 QWaylandDisplay *mDisplay;
146 QPlatformNativeInterface *mNativeInterface;
147 QScopedPointer<QPlatformInputContext> mInputContext;
148+#ifndef QT_NO_ACCESSIBILITY
149 QPlatformAccessibility *mAccessibility;
150+#endif
151 bool mClientBufferIntegrationInitialized;
152 bool mServerBufferIntegrationInitialized;
153 bool mShellIntegrationInitialized;
154--
1552.7.4
156
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
deleted file mode 100644
index 847ba06f..00000000
--- a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 47457635603ddb484a479834a052699cce5b34a3 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Fri, 19 Jul 2013 13:35:14 +0000
4Subject: [PATCH] Install the qtwaylandscanner tool to the native side
5
6Upstream-Status: Inappropiate [configuration]
7
8Signed-off-by: Simon Busch <morphis@gravedo.de>
9---
10 src/qtwaylandscanner/qtwaylandscanner.pro | 8 ++++++--
11 1 file changed, 6 insertions(+), 2 deletions(-)
12
13diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro
14index ac2d07b..7a46a24 100644
15--- a/src/qtwaylandscanner/qtwaylandscanner.pro
16+++ b/src/qtwaylandscanner/qtwaylandscanner.pro
17@@ -1,6 +1,10 @@
18 option(host_build)
19
20-SOURCES += qtwaylandscanner.cpp
21+TARGET = qtwaylandscanner$$qtPlatformTargetSuffix()
22+CONFIG += console warn_off
23+QT = core
24
25-load(qt_tool)
26+SOURCES += qtwaylandscanner.cpp
27
28+target.path = $$[QT_HOST_BINS]
29+INSTALLS += target
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
deleted file mode 100644
index a21c1094..00000000
--- a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 733a85c14cb4ade510a0c78b32cd12cb2d70dbbd Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 22 Feb 2014 17:47:44 +0100
4Subject: [PATCH] examples/wayland: include server-buffer only when building
5 with opengles2
6
7* it's using glBindBuffer in
8 server-buffer/client/serverbufferrenderer.cpp
9
10Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 examples/wayland/wayland.pro | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-)
15
16diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro
17index 503190c..9943c52 100644
18--- a/examples/wayland/wayland.pro
19+++ b/examples/wayland/wayland.pro
20@@ -10,4 +10,6 @@ qtHaveModule(quick) {
21 SUBDIRS += custom-extension
22 }
23
24-SUBDIRS += server-buffer
25+contains(QT_CONFIG, opengles2) {
26+ SUBDIRS += server-buffer
27+}
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index e315924c..ec41922a 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -16,37 +16,30 @@ LIC_FILES_CHKSUM = " \
16 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 16 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
17" 17"
18 18
19#FIXME: xkb should be optional; we add it here to fix the build error without it
20# (https://bugreports.qt.io/browse/QTBUG-54851)
21PACKAGECONFIG ?= " \ 19PACKAGECONFIG ?= " \
22 compositor-api \ 20 wayland-client \
21 wayland-server \
23 wayland-egl \ 22 wayland-egl \
24 xkb \ 23 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcompositor xkb glx', '', d)} \
26" 24"
27 25PACKAGECONFIG_class-native ?= ""
28PACKAGECONFIG[compositor-api] = "CONFIG+=wayland-compositor" 26PACKAGECONFIG_class-nativesdk ?= ""
29PACKAGECONFIG[xcompositor] = "CONFIG+=config_xcomposite CONFIG+=done_config_xcomposite,CONFIG+=done_config_xcomposite,libxcomposite" 27QMAKE_PROFILES_class-native = "${S}/src/qtwaylandscanner"
30PACKAGECONFIG[glx] = "CONFIG+=config_glx CONFIG+=done_config_glx,CONFIG+=done_config_glx,virtual/mesa" 28QMAKE_PROFILES_class-nativesdk = "${S}/src/qtwaylandscanner"
31PACKAGECONFIG[xkb] = "CONFIG+=config_xkbcommon CONFIG+=done_config_xkbcommon,CONFIG+=done_config_xkbcommon,libxkbcommon xproto" 29B_class-native = "${SEPB}/src/qtwaylandscanner"
32PACKAGECONFIG[wayland-egl] = "CONFIG+=config_wayland_egl CONFIG+=done_config_wayland_egl,CONFIG+=done_config_wayland_egl,virtual/egl" 30B_class-nativesdk = "${SEPB}/src/qtwaylandscanner"
33PACKAGECONFIG[brcm-egl] = "CONFIG+=config_brcm_egl CONFIG+=done_config_brcm_egl,CONFIG+=done_config_brcm_egl,virtual/egl" 31
34PACKAGECONFIG[drm-egl] = "CONFIG+=config_drm_egl_server CONFIG+=done_config_drm_egl_server,CONFIG+=done_config_drm_egl_server,libdrm virtual/egl" 32PACKAGECONFIG[wayland-client] = "-feature-wayland-client,-no-feature-wayland-client"
35PACKAGECONFIG[libhybris-egl] = "CONFIG+=config_libhybris_egl_server CONFIG+=done_config_libhybris_egl_server,CONFIG+=done_config_libhybris_egl_server,libhybris" 33PACKAGECONFIG[wayland-server] = "-feature-wayland-server,-no-feature-wayland-server"
36 34PACKAGECONFIG[xcomposite-egl] = "-feature-xcomposite-egl,-no-feature-xcomposite-egl,libxcomposite"
37EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 35PACKAGECONFIG[xcomposite-glx] = "-feature-xcomposite-glx,-no-feature-xcomposite-glx,virtual/mesa"
38 36PACKAGECONFIG[wayland-egl] = "-feature-wayland-egl,-no-feature-wayland-egl,virtual/egl"
39FILES_${PN}-plugins += " \ 37PACKAGECONFIG[wayland-brcm] = "-feature-wayland-brcm,-no-feature-wayland-brcm,virtual/egl"
40 ${OE_QMAKE_PATH_PLUGINS}/*/*/*${SOLIBSDEV} \ 38PACKAGECONFIG[drm-egl-server] = "-feature-drm-egl-server,-no-feature-drm-egl-server,libdrm virtual/egl"
41" 39PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature-libhybris-egl-server,libhybris"
42 40
43FILES_${PN}-plugins-dbg += " \ 41EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
44 ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ 42
45" 43SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e"
46 44
47SRC_URI += " \ 45BBCLASSEXTEND =+ "native nativesdk"
48 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
49 file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \
50"
51
52SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 45ac8141..d5f86850 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \
17 17
18DEPENDS += "qtdeclarative qtwebsockets" 18DEPENDS += "qtdeclarative qtwebsockets"
19 19
20SRCREV = "3836fd7d12777fc53836a72d6542d2fbf2f20ac9" 20SRCREV = "e3ddde4b26a72d57beeeed4e2d3384896e3a399d"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 6ec58ead..4ab30ead 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -20,14 +20,9 @@ DEPENDS += " \
20 libdrm fontconfig pixman openssl pango cairo icu pciutils \ 20 libdrm fontconfig pixman openssl pango cairo icu pciutils \
21 libcap \ 21 libcap \
22 gperf-native \ 22 gperf-native \
23 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
23" 24"
24 25
25# when qtbase is built with xcb enabled (default with x11 in DISTRO_FEATURES),
26# qtwebengine will have additional dependencies:
27# contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst
28# xscreensaver isn't covered in qtbase DEPENDS
29DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}"
30
31DEPENDS += "yasm-native" 26DEPENDS += "yasm-native"
32EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm" 27EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm"
33 28
@@ -52,6 +47,7 @@ COMPATIBLE_MACHINE_x86-64 = "(.*)"
52COMPATIBLE_MACHINE_armv6 = "(.*)" 47COMPATIBLE_MACHINE_armv6 = "(.*)"
53COMPATIBLE_MACHINE_armv7a = "(.*)" 48COMPATIBLE_MACHINE_armv7a = "(.*)"
54COMPATIBLE_MACHINE_armv7ve = "(.*)" 49COMPATIBLE_MACHINE_armv7ve = "(.*)"
50COMPATIBLE_MACHINE_aarch64 = "(.*)"
55 51
56inherit qmake5 52inherit qmake5
57inherit gettext 53inherit gettext
@@ -65,10 +61,6 @@ def gettext_oeconf(d):
65require qt5.inc 61require qt5.inc
66require qt5-git.inc 62require qt5-git.inc
67 63
68# To avoid trouble start with not separated build directory
69SEPB = "${S}"
70B = "${SEPB}"
71
72export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja" 64export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja"
73 65
74do_configure() { 66do_configure() {
@@ -82,11 +74,11 @@ do_configure() {
82 export QMAKE_CACHE_EVAL="${PACKAGECONFIG_CONFARGS}" 74 export QMAKE_CACHE_EVAL="${PACKAGECONFIG_CONFARGS}"
83 75
84 # Disable autodetection from sysroot: 76 # Disable autodetection from sysroot:
85 sed -i 's/packagesExist([^)]*vpx[^)]*):/false:/g; s/config_srtp:/false:/g; s/config_snappy:/false:/g; s/packagesExist(nss):/false:/g; s/packagesExist(minizip, zlib):/false:/g; s/packagesExist(libwebp,libwebpdemux):/false:/g; s/packagesExist(libxml-2.0,libxslt):/false:/g; s/^ *packagesExist($$package):/false:/g' ${S}/tools/qmake/mkspecs/features/configure.prf 77 sed -i 's/packagesExist([^)]*vpx[^)]*):/false:/g; s/config_libvpx:/false:/g; s/config_srtp:/false:/g; s/config_snappy:/false:/g; s/packagesExist(nss):/false:/g; s/packagesExist(minizip, zlib):/false:/g; s/packagesExist(libwebp,libwebpdemux):/false:/g; s/packagesExist(libxml-2.0,libxslt):/false:/g; s/^ *packagesExist($$package):/false:/g' ${S}/tools/qmake/mkspecs/features/configure.prf
86 78
87 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as 79 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as
88 # arguments here 80 # arguments here
89 ${OE_QMAKE_QMAKE} -r ${EXTRA_QMAKEVARS_PRE} QTWEBENGINE_ROOT="${S}" \ 81 ${OE_QMAKE_QMAKE} ${OE_QMAKE_QTCONF} -r ${EXTRA_QMAKEVARS_PRE} ${S} \
90 QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \ 82 QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \
91 QMAKE_LINK="${OE_QMAKE_LINK}" \ 83 QMAKE_LINK="${OE_QMAKE_LINK}" \
92 QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ 84 QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \
@@ -110,7 +102,7 @@ RDEPENDS_${PN}-examples += " \
110 qtdeclarative-qmlplugins \ 102 qtdeclarative-qmlplugins \
111" 103"
112 104
113QT_MODULE_BRANCH_CHROMIUM = "49-based" 105QT_MODULE_BRANCH_CHROMIUM = "53-based"
114 106
115SRC_URI += " \ 107SRC_URI += " \
116 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 108 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
@@ -123,15 +115,11 @@ SRC_URI += " \
123 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 115 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
124" 116"
125 117
126SRCREV_qtwebengine = "dbf7dd27428ff755444eac5e975cb69802ac9771" 118SRCREV_qtwebengine = "d740d6a7dbfec387752c7bc8a8b06db0e757c9dc"
127# This is in git submodule, but we're using the latest in 49-based 119SRCREV_chromium = "15d257fd921f37b32ef643225f21df0ea24c8302"
128# SRCREV_chromium = "c109a95a067af783e48f93d1cdeca870cda98878"
129SRCREV_chromium = "29c16917b33c26ad32893fa05af971c6c6f50297"
130SRCREV = "${SRCREV_qtwebengine}" 120SRCREV = "${SRCREV_qtwebengine}"
131 121
132SRCREV_FORMAT = "qtwebengine_chromium" 122SRCREV_FORMAT = "qtwebengine_chromium"
133 123
134S = "${WORKDIR}/git"
135
136# WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel] 124# WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel]
137INSANE_SKIP_${PN} += "textrel" 125INSANE_SKIP_${PN} += "textrel"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index e5075de6..84b4d0ba 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" 18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
19 19
20SRCREV = "1ac4ee240214a0e36b504fa1bcbc0c716d50620f" 20SRCREV = "f0898f83abdcacc8bd3bca3479884376b0963398"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index d0d7ee8c..2d69bb86 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -86,4 +86,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
86RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 86RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
87export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 87export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
88 88
89SRCREV = "76e2732f013732461c09a1d6c6b4c77fcab1c0d0" 89SRCREV = "74ac5b0f3489f9a08d083b6c9607c9d5c2d4afd2"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 8c238db8..043b394e 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -3,12 +3,12 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 4LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ 9 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
10" 10"
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "8d17ddfc2f62df56ac067bd0f9736c6e8d37aa97" 14SRCREV = "afb3c58d035db1119666c8556c215187be4f64b8"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 9a4d6d7d..81c72ec8 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -3,14 +3,14 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" 4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "bae8bfc7a811af2bf51b227cbf8467e50a2a149a" 16SRCREV = "54cc3158acfc75d12338df3b678e013909e66f60"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index e4c3d7fd..c7efaf3f 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \
16 16
17DEPENDS += "qtbase" 17DEPENDS += "qtbase"
18 18
19SRCREV = "574d92a43e1fc5480a7f5f79cc6baf566a53349f" 19SRCREV = "9f7e01b582b1bd83cc6b8a854c510871335e2e74"
20 20
21BBCLASSEXTEND =+ "native nativesdk" 21BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-09 10:29:21 +0000