summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-09-07 10:06:40 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-09-30 09:03:09 +0000
commit9195d9dc805fd3132023ff33bc77ace1f3f7e40f (patch)
treedeb85ffd58ce712d2ff0b5b5d49ec496232dfcc9
parentd7ebb6ce9b49eb52c325e73d92157d874e9cf907 (diff)
downloadmeta-qt5-9195d9dc805fd3132023ff33bc77ace1f3f7e40f.tar.gz
qt5: update 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. Change-Id: I4c937c1acb3d204ac4560090cab3d0fc7e0e815a Reviewed-by: Risto Avila <risto.avila@qt.io> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat
-rw-r--r--classes/qmake5_base.bbclass22
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb63
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch8
-rw-r--r--recipes-qt/qt5/qt3d_git.bb10
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qt5.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb21
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch204
-rw-r--r--recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch55
-rw-r--r--recipes-qt/qt5/qtbase/0002-configure-force-cross_compile.patch32
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch18
-rw-r--r--recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch95
-rw-r--r--recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch33
-rw-r--r--recipes-qt/qt5/qtbase/0013-Use-pkgconfig-to-configure-freetype2.patch25
-rw-r--r--recipes-qt/qt5/qtbase_git.bb60
-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.bb2
-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_git.bb2
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb9
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb10
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb10
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb10
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-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/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_git.bb7
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb2
-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.bb6
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb10
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch37
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb3
-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
49 files changed, 277 insertions, 624 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index f273567d..fa1bc563 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -31,18 +31,18 @@ EXTRA_OEMAKE = " \
31" 31"
32 32
33OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" 33OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake"
34OE_QMAKE_COMPILER = "${CC}" 34export OE_QMAKE_COMPILER = "${CC}"
35OE_QMAKE_CC = "${CC}" 35export OE_QMAKE_CC = "${CC}"
36OE_QMAKE_CFLAGS = "${CFLAGS}" 36export OE_QMAKE_CFLAGS = "${CFLAGS}"
37OE_QMAKE_CXX = "${CXX}" 37export OE_QMAKE_CXX = "${CXX}"
38OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" 38export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
39OE_QMAKE_LINK = "${CXX}" 39export OE_QMAKE_LINK = "${CXX}"
40OE_QMAKE_LDFLAGS = "${LDFLAGS}" 40export OE_QMAKE_LDFLAGS = "${LDFLAGS}"
41OE_QMAKE_AR = "${AR}" 41export OE_QMAKE_AR = "${AR}"
42OE_QMAKE_STRIP = "echo" 42export OE_QMAKE_STRIP = "echo"
43OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" 43export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner"
44OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" 44OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf"
45OE_QMAKE_QTCONF = "-qtconf ${OE_QMAKE_QTCONF_PATH}" 45export OE_QMAKE_QTCONF = "-qtconf ${OE_QMAKE_QTCONF_PATH}"
46 46
47inherit qmake5_paths remove-libtool 47inherit qmake5_paths remove-libtool
48 48
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index aecb0856..b655a7e1 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -27,14 +27,13 @@ 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-configure-Separate-host-and-build-platform.patch \ 30 file://0002-configure-force-cross_compile.patch \
31 file://0003-Add-external-hostbindir-option.patch \ 31 file://0003-Add-external-hostbindir-option.patch \
32 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 32 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
33 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 33 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
34 file://0006-QOpenGLPaintDevice-sub-area-support.patch \ 34 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
35 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ 35 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
36 file://0008-configure-paths-for-target-qmake-properly.patch \ 36 file://0008-configure-paths-for-target-qmake-properly.patch \
37 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \
38 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 37 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
39" 38"
40 39
@@ -96,56 +95,6 @@ QT_CONFIG_FLAGS += " \
96OE_QMAKE_PATH_HOST_DATA = "${libdir}${QT_DIR_NAME}" 95OE_QMAKE_PATH_HOST_DATA = "${libdir}${QT_DIR_NAME}"
97OE_QMAKE_PATH_HOST_LIBS = "${libdir}" 96OE_QMAKE_PATH_HOST_LIBS = "${libdir}"
98 97
99do_generate_qt_config_file() {
100 cat > ${OE_QMAKE_QTCONF_PATH} <<EOF
101[Paths]
102Prefix = ${OE_QMAKE_PATH_PREFIX}
103Headers = ${OE_QMAKE_PATH_HEADERS}
104Libraries = ${OE_QMAKE_PATH_LIBS}
105ArchData = ${OE_QMAKE_PATH_ARCHDATA}
106Data = ${OE_QMAKE_PATH_DATA}
107Binaries = ${OE_QMAKE_PATH_BINS}
108LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
109Plugins = ${OE_QMAKE_PATH_PLUGINS}
110Imports = ${OE_QMAKE_PATH_IMPORTS}
111Qml2Imports = ${OE_QMAKE_PATH_QML}
112Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
113Documentation = ${OE_QMAKE_PATH_DOCS}
114Settings = ${OE_QMAKE_PATH_SETTINGS}
115Examples = ${OE_QMAKE_PATH_EXAMPLES}
116Tests = ${OE_QMAKE_PATH_TESTS}
117HostBinaries = ${OE_QMAKE_PATH_HOST_BINS}
118HostData = ${OE_QMAKE_PATH_HOST_DATA}
119HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS}
120HostSpec = ${OE_QMAKE_PLATFORM_NATIVE}
121TargetSpec = ${OE_QMAKE_PLATFORM}
122ExternalHostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}
123Sysroot =
124EOF
125}
126
127do_generate_qt_config_file_append() {
128 cat >> ${OE_QMAKE_QTCONF_PATH} <<EOF
129
130[EffectivePaths]
131Prefix=${B}
132EOF
133}
134
135# qtbase is exception, we need to use mkspecs from ${S}
136QMAKE_MKSPEC_PATH = "${B}"
137
138# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell
139export OE_QMAKE_COMPILER
140export OE_QMAKE_CC
141export OE_QMAKE_CFLAGS
142export OE_QMAKE_CXX
143export OE_QMAKE_CXXFLAGS
144export OE_QMAKE_LINK
145export OE_QMAKE_LDFLAGS
146export OE_QMAKE_AR
147export OE_QMAKE_STRIP
148
149do_configure() { 98do_configure() {
150 ${S}/configure -v \ 99 ${S}/configure -v \
151 -opensource -confirm-license \ 100 -opensource -confirm-license \
@@ -190,21 +139,15 @@ do_configure() {
190 -silent \ 139 -silent \
191 -nomake examples \ 140 -nomake examples \
192 -nomake tests \ 141 -nomake tests \
193 -nomake libs \
194 -no-compile-examples \ 142 -no-compile-examples \
195 -no-rpath \ 143 -no-rpath \
196 -platform ${OE_QMAKE_PLATFORM_NATIVE} \ 144 -platform ${OE_QMAKE_PLATFORM_NATIVE} \
197 -xplatform ${OE_QMAKE_PLATFORM} \ 145 -xplatform ${OE_QMAKE_PLATFORM} \
198 ${QT_CONFIG_FLAGS} 146 ${QT_CONFIG_FLAGS}
199
200 ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_QTCONF} ${S} -o Makefile || die "Configuring qt with qmake failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}"
201} 147}
202 148
203do_install() { 149do_install() {
204 # Fix install paths for all 150 qmake5_base_do_install
205 find . -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
206
207 oe_runmake install INSTALL_ROOT=${D}
208 151
209 # remove things unused in nativesdk, we need the headers and libs 152 # remove things unused in nativesdk, we need the headers and libs
210 rm -rf ${D}${datadir} \ 153 rm -rf ${D}${datadir} \
@@ -247,4 +190,4 @@ fakeroot do_generate_qt_environment_file() {
247 190
248addtask generate_qt_environment_file after do_install before do_package 191addtask generate_qt_environment_file after do_install before do_package
249 192
250SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd" 193SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e"
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..2e8d887e 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,4 +1,4 @@
1From befe1fd63c485b8d10d1b9f1eca3368f3ee0042b Mon Sep 17 00:00:00 2001 1From 19e8db58f5c344cc15aba5c0525ceddaa307d39d Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
@@ -8,12 +8,12 @@ Subject: [PATCH] Allow a tools-only build
8 1 file changed, 6 insertions(+), 1 deletion(-) 8 1 file changed, 6 insertions(+), 1 deletion(-)
9 9
10diff --git a/qt3d.pro b/qt3d.pro 10diff --git a/qt3d.pro b/qt3d.pro
11index a26e76d..016fb30 100644 11index 83e0ffc..9bb7690 100644
12--- a/qt3d.pro 12--- a/qt3d.pro
13+++ b/qt3d.pro 13+++ b/qt3d.pro
14@@ -1,4 +1,4 @@ 14@@ -1,4 +1,4 @@
15-requires(contains(QT_CONFIG, opengl)) 15-requires(qtConfig(opengl))
16+!tools-only:requires(contains(QT_CONFIG, opengl)) 16+!tools-only:requires(qtConfig(opengl))
17 17
18 load(configure) 18 load(configure)
19 qtCompileTest(assimp) 19 qtCompileTest(assimp)
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 9708ec92..2d8fe45c 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,7 +18,7 @@ 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] = "CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib"
22 22
23EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 23EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
24 24
@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \
27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \ 27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \
28" 28"
29 29
30SRCREV = "c3fdb888fbd94de0f6b7b1a6859cba8132ecc93d" 30SRCREV = "52121396c55e6100316f006c87b4fdaa8b5a0719"
31 31
32BBCLASSEXTEND += "native nativesdk" 32BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 3e1bc72a..a1dd16a9 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.7" 5QT_MODULE_BRANCH ?= "5.8"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
@@ -12,4 +12,4 @@ SRC_URI = " \
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
15PV = "5.7.1+git${SRCPV}" 15PV = "5.8.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index b066dded..a01c490c 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -103,11 +103,13 @@ FILES_${PN}-qmlplugins = " \
103 ${OE_QMAKE_PATH_QML}/*/*.qmltypes \ 103 ${OE_QMAKE_PATH_QML}/*/*.qmltypes \
104 ${OE_QMAKE_PATH_QML}/*/*.qml \ 104 ${OE_QMAKE_PATH_QML}/*/*.qml \
105 ${OE_QMAKE_PATH_QML}/*/*.js \ 105 ${OE_QMAKE_PATH_QML}/*/*.js \
106 ${OE_QMAKE_PATH_QML}/*/*.png \
106 ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \ 107 ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \
107 ${OE_QMAKE_PATH_QML}/*/*/qmldir \ 108 ${OE_QMAKE_PATH_QML}/*/*/qmldir \
108 ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \ 109 ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \
109 ${OE_QMAKE_PATH_QML}/*/*/*.qml \ 110 ${OE_QMAKE_PATH_QML}/*/*/*.qml \
110 ${OE_QMAKE_PATH_QML}/*/*/*.js \ 111 ${OE_QMAKE_PATH_QML}/*/*/*.js \
112 ${OE_QMAKE_PATH_QML}/*/*/*.png \
111 ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \ 113 ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \
112 ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \ 114 ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \
113 ${OE_QMAKE_PATH_QML}/*/*/*/images \ 115 ${OE_QMAKE_PATH_QML}/*/*/*/images \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index a9bd2538..332871aa 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -22,14 +22,12 @@ 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-configure-Separate-host-and-build-platform.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 \ 28 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
30 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ 29 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
31 file://0008-configure-paths-for-target-qmake-properly.patch \ 30 file://0008-configure-paths-for-target-qmake-properly.patch \
32 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \
33 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 31 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
34" 32"
35 33
@@ -41,10 +39,6 @@ SRC_URI += " \
41 39
42CLEANBROKEN = "1" 40CLEANBROKEN = "1"
43 41
44do_generate_qt_config_file() {
45 :
46}
47
48PACKAGECONFIG_CONFARGS = " \ 42PACKAGECONFIG_CONFARGS = " \
49 -sysroot ${STAGING_DIR_NATIVE} \ 43 -sysroot ${STAGING_DIR_NATIVE} \
50 -no-gcc-sysroot \ 44 -no-gcc-sysroot \
@@ -65,6 +59,7 @@ PACKAGECONFIG_CONFARGS = " \
65 -verbose \ 59 -verbose \
66 -release \ 60 -release \
67 -prefix ${OE_QMAKE_PATH_PREFIX} \ 61 -prefix ${OE_QMAKE_PATH_PREFIX} \
62 -hostprefix ${OE_QMAKE_PATH_PREFIX} \
68 -bindir ${OE_QMAKE_PATH_BINS} \ 63 -bindir ${OE_QMAKE_PATH_BINS} \
69 -hostbindir ${OE_QMAKE_PATH_BINS} \ 64 -hostbindir ${OE_QMAKE_PATH_BINS} \
70 -libdir ${OE_QMAKE_PATH_LIBS} \ 65 -libdir ${OE_QMAKE_PATH_LIBS} \
@@ -84,20 +79,8 @@ PACKAGECONFIG_CONFARGS = " \
84 -platform linux-oe-g++ \ 79 -platform linux-oe-g++ \
85" 80"
86 81
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() { 82do_configure_prepend() {
99 MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" 83 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} 84}
102 85
103do_install() { 86do_install() {
@@ -123,4 +106,4 @@ do_install() {
123 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 106 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
124} 107}
125 108
126SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd" 109SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e"
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 43ce9bf2..5f703dac 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 93c50c089f2f6d7aa1cd947386813e368100c3c6 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,172 +7,55 @@ 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
40Upstream-Status: Inappropriate [embedded specific] 17Upstream-Status: Inappropriate [embedded specific]
41 too OE specific, probably cannot be upstreamed 18 too OE specific, probably cannot be upstreamed
42 19
43Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c 20Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c
44Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 21Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
45--- 22---
46 configure | 55 ++++++++++++------- 23 configure | 2 +-
47 mkspecs/features/configure.prf | 4 +- 24 mkspecs/features/configure.prf | 4 +-
48 mkspecs/linux-oe-g++/qmake.conf | 42 +++++++++++++++ 25 mkspecs/features/qt_functions.prf | 2 +-
26 mkspecs/linux-oe-g++/qmake.conf | 43 +++++++++++++++
49 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ 27 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
50 4 files changed, 181 insertions(+), 20 deletions(-) 28 mkspecs/oe-device-extra.pri | 0
29 6 files changed, 147 insertions(+), 4 deletions(-)
51 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 30 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
52 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 31 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
32 create mode 100644 mkspecs/oe-device-extra.pri
53 33
54diff --git a/configure b/configure 34diff --git a/configure b/configure
55index 0ba0c31..052872e 100755 35index 789ba4c..269f69d 100755
56--- a/configure 36--- a/configure
57+++ b/configure 37+++ b/configure
58@@ -333,6 +333,16 @@ getQMakeConf() 38@@ -1624,7 +1624,7 @@ fi
59 getSingleQMakeVariable "$1" "$specvals" 39 # is where the resulting variable is written to
60 } 40 setBootstrapVariable()
61
62+# OE qmake.conf is reading some variables from shell env
63+# read them from qmake.conf, replace qmake () syntax with shell and eval
64+getQEvalMakeConf()
65+{
66+ VAL=`getQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
67+ EVAL=`eval "echo ${VAL}"`
68+# echo "Running getQEvalMakeConf: var='$1', val='`getQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
69+ eval "echo ${VAL}"
70+}
71+
72 getXQMakeConf()
73 {
74 if [ -z "$xspecvals" ]; then
75@@ -357,6 +367,16 @@ testXConfig()
76 esac
77 }
78
79+# OE qmake.conf is reading some variables from shell env
80+# read them from qmake.conf, replace qmake () syntax with shell and eval
81+getXQEvalMakeConf()
82+{
83+ VAL=`getXQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
84+ EVAL=`eval "echo ${VAL}"`
85+# echo "Running getXQEvalMakeConf: var='$1', val='`getXQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
86+ eval "echo ${VAL}"
87+}
88+
89 compilerSupportsFlag()
90 { 41 {
91 cat >conftest.cpp <<EOF 42- getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
92@@ -578,24 +598,14 @@ fi 43+ getQMakeConf "$1" | sed 's:\$\$(:\$(:' | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
93 # initalize variables
94 #-------------------------------------------------------------------------------
95
96-SYSTEM_VARIABLES="AR RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
97-for varname in $SYSTEM_VARIABLES; do
98+# Export all OE variables for qmake.conf from shell env to QMakeVars
99+OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP"
100+for varname in $OE_VARIABLES; do
101 qmakevarname="${varname}"
102- qmakecmdargs=""
103- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
104- if [ "${varname}" = "LDFLAGS" ]; then
105- qmakevarname="LFLAGS"
106- elif [ "${varname}" = "LD" ]; then
107- qmakevarname="LINK"
108- elif [ "${varname}" = "AR" ]; then
109- # QMAKE_AR needs to be set to "/path/to/ar cqs" but the
110- # environment variable will be set to the command only so we
111- # need to append " cqs" for autoconf compatibility
112- qmakecmdargs=" cqs"
113- fi
114 cmd=`echo \
115-'if [ -n "\$'${varname}'" ]; then
116- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}${qmakecmdargs}'"
117+'if [ -n "\$OE_QMAKE_'${varname}'" ]; then
118+ QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'"
119+# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2
120 fi'`
121 eval "$cmd"
122 done
123@@ -3443,7 +3453,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
124 [ "$CFG_GTK" = "auto" ] && CFG_GTK=no
125 fi
126
127-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
128+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX`
129
130 TEST_COMPILER=$QMAKE_CONF_COMPILER
131
132@@ -3494,7 +3504,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then
133 fi
134 fi
135
136-TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS`
137+TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS`
138
139 GCC_MACHINE_DUMP=
140 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
141@@ -3893,6 +3903,14 @@ setBootstrapVariable()
142 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
143 } 44 }
144 45
145+# OE qmake.conf is reading some variables from shell env
146+# read them from qmake.conf, replace qmake () syntax with shell and eval
147+setBootstrapEvalVariable()
148+{
149+ getQEvalMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
150+}
151+
152+
153 # build qmake 46 # build qmake
154 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
155 echo "Creating qmake..."
156@@ -3986,6 +4004,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
157 EXEEXT=
158 ;;
159 esac
160+
161 if [ "$BUILD_ON_MAC" = "yes" ]; then
162 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile"
163 echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
164diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 47diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
165index a890c7f..151630c 100644 48index f275e3a..5aa15f5 100644
166--- a/mkspecs/features/configure.prf 49--- a/mkspecs/features/configure.prf
167+++ b/mkspecs/features/configure.prf 50+++ b/mkspecs/features/configure.prf
168@@ -71,14 +71,14 @@ defineTest(qtCompileTest) { 51@@ -37,14 +37,14 @@ defineTest(qtCompileTest) {
169 } 52 }
170 53
171 # Clean up after previous run 54 # Clean up after previous run
172- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") 55- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
173+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") 56+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean")
174 57
175 mkpath($$test_out_dir)|error("Aborting.") 58 mkpath($$test_out_dir)|error()
176 59
177 !isEmpty (QMAKE_QTCONF): qtconfarg = -qtconf $$QMAKE_QTCONF 60 !isEmpty (QMAKE_QTCONF): qtconfarg = -qtconf $$QMAKE_QTCONF
178 61
@@ -182,12 +65,25 @@ index a890c7f..151630c 100644
182 log("yes$$escape_expand(\\n)") 65 log("yes$$escape_expand(\\n)")
183 msg = "test $$1 succeeded" 66 msg = "test $$1 succeeded"
184 write_file($$QMAKE_CONFIG_LOG, msg, append) 67 write_file($$QMAKE_CONFIG_LOG, msg, append)
68diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
69index efbf2fa..78b453c 100644
70--- a/mkspecs/features/qt_functions.prf
71+++ b/mkspecs/features/qt_functions.prf
72@@ -67,7 +67,7 @@ defineTest(qtHaveModule) {
73 defineTest(qtPrepareTool) {
74 cmd = $$eval(QT_TOOL.$${2}.binary)
75 isEmpty(cmd) {
76- cmd = $$[QT_HOST_BINS]/$$2
77+ cmd = $$[QT_HOST_BINS/get]/$$2
78 exists($${cmd}.pl) {
79 $${1}_EXE = $${cmd}.pl
80 cmd = perl -w $$system_path($${cmd}.pl)
185diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 81diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
186new file mode 100644 82new file mode 100644
187index 0000000..311ba04 83index 0000000..dd8d5c2
188--- /dev/null 84--- /dev/null
189+++ b/mkspecs/linux-oe-g++/qmake.conf 85+++ b/mkspecs/linux-oe-g++/qmake.conf
190@@ -0,0 +1,42 @@ 86@@ -0,0 +1,43 @@
191+# 87+#
192+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded 88+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
193+# 89+#
@@ -199,36 +95,37 @@ index 0000000..311ba04
199+include(../common/linux.conf) 95+include(../common/linux.conf)
200+ 96+
201+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip 97+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
202+QMAKE_AR = $(OE_QMAKE_AR) cqs 98+QMAKE_AR = $$(OE_QMAKE_AR) cqs
203+QMAKE_STRIP = $(OE_QMAKE_STRIP) 99+QMAKE_STRIP = $$(OE_QMAKE_STRIP)
204+QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER) 100+QMAKE_WAYLAND_SCANNER = $$(OE_QMAKE_WAYLAND_SCANNER)
205+ 101+
206+include(../common/gcc-base-unix.conf) 102+include(../common/gcc-base-unix.conf)
207+ 103+
208+# *FLAGS from gcc-base.conf 104+# *FLAGS from gcc-base.conf
209+QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS) 105+QMAKE_CFLAGS += $$(OE_QMAKE_CFLAGS)
210+QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS) 106+QMAKE_CXXFLAGS += $$(OE_QMAKE_CXXFLAGS)
211+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) 107+QMAKE_LFLAGS += $$(OE_QMAKE_LDFLAGS)
212+ 108+
213+include(../common/g++-unix.conf) 109+include(../common/g++-unix.conf)
214+ 110+
215+# tc settings from g++-base.conf 111+# tc settings from g++-base.conf
216+QMAKE_COMPILER = $(OE_QMAKE_COMPILER) gcc 112+QMAKE_COMPILER = $$(OE_QMAKE_COMPILER) gcc
217+QMAKE_CC = $(OE_QMAKE_CC) 113+QMAKE_CC = $$(OE_QMAKE_CC)
218+QMAKE_CXX = $(OE_QMAKE_CXX) 114+QMAKE_CXX = $$(OE_QMAKE_CXX)
219+ 115+
220+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) 116+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(OE_QMAKE_CFLAGS)
221+ 117+
222+QMAKE_LINK = $(OE_QMAKE_LINK) 118+QMAKE_LINK = $$(OE_QMAKE_LINK)
223+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) 119+QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK)
224+QMAKE_LINK_C = $(OE_QMAKE_LINK) 120+QMAKE_LINK_C = $$(OE_QMAKE_LINK)
225+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) 121+QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK)
226+ 122+
227+# for the SDK 123+# for the SDK
228+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) 124+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
229+ 125+
230+include(../oe-device-extra.pri) 126+include(../oe-device-extra.pri)
231+ 127+
128+load(device_config)
232+load(qt_config) 129+load(qt_config)
233diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h 130diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
234new file mode 100644 131new file mode 100644
@@ -336,3 +233,6 @@ index 0000000..dd12003
336+#endif 233+#endif
337+ 234+
338+#endif // QPLATFORMDEFS_H 235+#endif // QPLATFORMDEFS_H
236diff --git a/mkspecs/oe-device-extra.pri b/mkspecs/oe-device-extra.pri
237new file mode 100644
238index 0000000..e69de29
diff --git a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
deleted file mode 100644
index 9884976d..00000000
--- a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 34676aae2d06271014ee4a67498e6e2f0fe97139 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Fri, 11 Mar 2016 16:00:23 +0200
4Subject: [PATCH] configure: Separate host and build platform
5
6Missing bits that were not upstreamed
7
8Change-Id: I6bfed072c9826094dcda9c7112b0c8b9d4055366
9---
10 configure | 2 +-
11 mkspecs/features/qt_functions.prf | 2 +-
12 mkspecs/features/qt_tool.prf | 1 +
13 3 files changed, 3 insertions(+), 2 deletions(-)
14
15diff --git a/configure b/configure
16index 03e89d5..2fa97d3 100755
17--- a/configure
18+++ b/configure
19@@ -3293,7 +3293,7 @@ if [ -d "$XPLATFORM" ]; then
20 else
21 XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}"
22 fi
23-if [ "$PLATFORM" != "$XPLATFORM" ]; then
24+if [ "$PLATFORM" != "$XPLATFORM" ] || [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then
25 QT_CROSS_COMPILE=yes
26 QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
27 QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile"
28diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
29index 9c3414c..91d1888 100644
30--- a/mkspecs/features/qt_functions.prf
31+++ b/mkspecs/features/qt_functions.prf
32@@ -71,7 +71,7 @@ defineTest(qtHaveModule) {
33 defineTest(qtPrepareTool) {
34 cmd = $$eval(QT_TOOL.$${2}.binary)
35 isEmpty(cmd) {
36- cmd = $$[QT_HOST_BINS]/$$2
37+ cmd = $$[QT_HOST_BINS/get]/$$2
38 exists($${cmd}.pl) {
39 cmd = perl -w $$system_path($${cmd}.pl)
40 } else: contains(QMAKE_HOST.os, Windows) {
41diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
42index bdeb59c..ecc0ca2 100644
43--- a/mkspecs/features/qt_tool.prf
44+++ b/mkspecs/features/qt_tool.prf
45@@ -21,6 +21,7 @@ DEFINES *= QT_USE_QSTRINGBUILDER
46 isEmpty(MODULE):MODULE = $$TARGET
47
48 load(qt_build_paths)
49+ load(device_config)
50
51 TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri
52
53--
541.9.1
55
diff --git a/recipes-qt/qt5/qtbase/0002-configure-force-cross_compile.patch b/recipes-qt/qt5/qtbase/0002-configure-force-cross_compile.patch
new file mode 100644
index 00000000..3f011b09
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0002-configure-force-cross_compile.patch
@@ -0,0 +1,32 @@
1From 3ed6db12a1de305eae7c61e6e11572d77a75d595 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Fri, 11 Mar 2016 16:00:23 +0200
4Subject: [PATCH] configure: force cross_compile
5
6Configure enabled cross_compile only if mkspec and xmkspec are difference,
7in yocto build that is never true, so force cross_compile feature.
8
9Use qttools (moc etc.) from correct path defined by qt.conf
10
11Upstream-Status: Inappropriate [embedded specific]
12
13Change-Id: I6bfed072c9826094dcda9c7112b0c8b9d4055366
14---
15 configure.pri | 4 +---
16 1 file changed, 1 insertion(+), 3 deletions(-)
17
18diff --git a/configure.pri b/configure.pri
19index 6a75398..940e307 100644
20--- a/configure.pri
21+++ b/configure.pri
22@@ -57,9 +57,7 @@ defineTest(qtConfCommandline_sanitize) {
23 # callbacks
24
25 defineReplace(qtConfFunc_crossCompile) {
26- spec = $$[QMAKE_SPEC]
27- !equals(spec, $$[QMAKE_XSPEC]): return(true)
28- return(false)
29+ return(true)
30 }
31
32 # custom tests
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/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-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/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/0013-Use-pkgconfig-to-configure-freetype2.patch b/recipes-qt/qt5/qtbase/0013-Use-pkgconfig-to-configure-freetype2.patch
new file mode 100644
index 00000000..453a1f3a
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0013-Use-pkgconfig-to-configure-freetype2.patch
@@ -0,0 +1,25 @@
1From 3f88cd7cfb1ad2ebcd29ff736282fa993038036c Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 23 Sep 2016 11:32:52 +0300
4Subject: [PATCH] Use pkgconfig to configure freetype2
5
6Change-Id: I0f94ac981f3283bd8410c0bb9c8732aeabce3148
7---
8 src/gui/configure.json | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/src/gui/configure.json b/src/gui/configure.json
12index 376359b..0554a08 100644
13--- a/src/gui/configure.json
14+++ b/src/gui/configure.json
15@@ -90,6 +90,7 @@
16 "export": "",
17 "test": "unix/freetype",
18 "sources": [
19+ { "type": "pkgConfig", "args": "freetype2" },
20 "-lfreetype"
21 ]
22 },
23--
241.9.1
25
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index a6a18948..50795bfb 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -17,16 +17,15 @@ 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-configure-Separate-host-and-build-platform.patch \ 20 file://0002-configure-force-cross_compile.patch \
21 file://0003-Add-external-hostbindir-option.patch \ 21 file://0003-Add-external-hostbindir-option.patch \
22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
23 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 23 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
24 file://0006-QOpenGLPaintDevice-sub-area-support.patch \ 24 file://0006-QOpenGLPaintDevice-sub-area-support.patch \
25 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ 25 file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
26 file://0008-configure-paths-for-target-qmake-properly.patch \ 26 file://0008-configure-paths-for-target-qmake-properly.patch \
27 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \
28 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 27 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
29 file://0013-Fix-build-with-QT_NO_OPENGL.patch \ 28 file://0013-Use-pkgconfig-to-configure-freetype2.patch \
30" 29"
31 30
32DEPENDS += "qtbase-native" 31DEPENDS += "qtbase-native"
@@ -43,7 +42,7 @@ RDEPENDS_${PN}-tools += "perl"
43 42
44PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 43PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
45PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 44PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
46PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xsync xshape xrender xrandr xfixes xinput2 xcursor glib xkb', '', d)}" 45PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb', '', d)}"
47PACKAGECONFIG_FONTS ?= "" 46PACKAGECONFIG_FONTS ?= ""
48PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" 47PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
49PACKAGECONFIG_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 48PACKAGECONFIG_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
@@ -75,14 +74,14 @@ PACKAGECONFIG[tests] = "-make tests,-nomake tests"
75PACKAGECONFIG[examples] = "-make examples -compile-examples,-nomake examples" 74PACKAGECONFIG[examples] = "-make examples -compile-examples,-nomake examples"
76PACKAGECONFIG[tools] = "-make tools,-nomake tools" 75PACKAGECONFIG[tools] = "-make tools,-nomake tools"
77# only for completeness, configure will add libs even if you try to explicitly remove it 76# only for completeness, configure will add libs even if you try to explicitly remove it
78PACKAGECONFIG[libs] = "-make libs,-nomake libs" 77PACKAGECONFIG[libs] = "-make libs"
79# accessibility is required to compile qtquickcontrols 78# accessibility is required to compile qtquickcontrols
80PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" 79PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility"
81PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" 80PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0"
82# use either system freetype or bundled freetype, if you disable freetype completely 81# use either system freetype or bundled freetype, if you disable freetype completely
83# fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype 82# fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype
84# works only together with fontconfig 83# works only together with fontconfig
85PACKAGECONFIG[freetype] = "-system-freetype,-freetype,freetype" 84PACKAGECONFIG[freetype] = "-system-freetype,-qt-freetype,freetype"
86PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-no-harfbuzz,harfbuzz" 85PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-no-harfbuzz,harfbuzz"
87PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" 86PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg"
88PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" 87PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng"
@@ -104,14 +103,8 @@ PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds"
104PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" 103PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2"
105PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite" 104PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite"
106PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3" 105PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3"
107PACKAGECONFIG[xcursor] = "-xcursor,-no-xcursor,libxcursor"
108PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi" 106PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi"
109PACKAGECONFIG[xfixes] = "-xfixes,-no-xfixes,libxfixes"
110PACKAGECONFIG[xrandr] = "-xrandr,-no-xrandr,libxrandr"
111PACKAGECONFIG[xrender] = "-xrender,-no-xrender,libxrender" 107PACKAGECONFIG[xrender] = "-xrender,-no-xrender,libxrender"
112PACKAGECONFIG[xshape] = "-xshape,-no-xshape"
113PACKAGECONFIG[xsync] = "-xsync,-no-xsync"
114PACKAGECONFIG[openvg] = "-openvg,-no-openvg"
115PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" 108PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv"
116PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" 109PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon"
117PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config" 110PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config"
@@ -122,7 +115,6 @@ PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig"
122PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+" 115PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+"
123PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" 116PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
124PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" 117PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
125PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
126PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" 118PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
127# needed for qtwebkit 119# needed for qtwebkit
128PACKAGECONFIG[icu] = "-icu,-no-icu,icu" 120PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
@@ -144,29 +136,6 @@ QT_CONFIG_FLAGS += " \
144 ${PACKAGECONFIG_CONFARGS} \ 136 ${PACKAGECONFIG_CONFARGS} \
145" 137"
146 138
147generate_qt_config_file_effective_paths() {
148 cat >> ${OE_QMAKE_QTCONF_PATH} <<EOF
149[EffectivePaths]
150Prefix=${B}
151EOF
152}
153
154OE_QMAKE_PATH_HOST_DATA = "${STAGING_LIBDIR}${QT_DIR_NAME}"
155# qtbase is exception, we need to use mkspecs from ${S}
156QMAKE_MKSPEC_PATH_TARGET = "${B}"
157QMAKE_MKSPEC_PATH = "${S}"
158
159# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell
160export OE_QMAKE_COMPILER
161export OE_QMAKE_CC
162export OE_QMAKE_CFLAGS
163export OE_QMAKE_CXX
164export OE_QMAKE_CXXFLAGS
165export OE_QMAKE_LINK
166export OE_QMAKE_LDFLAGS
167export OE_QMAKE_AR
168export OE_QMAKE_STRIP
169
170do_configure() { 139do_configure() {
171 ${S}/configure -v \ 140 ${S}/configure -v \
172 -opensource -confirm-license \ 141 -opensource -confirm-license \
@@ -186,33 +155,26 @@ do_configure() {
186 -translationdir ${OE_QMAKE_PATH_TRANSLATIONS} \ 155 -translationdir ${OE_QMAKE_PATH_TRANSLATIONS} \
187 -testsdir ${OE_QMAKE_PATH_TESTS} \ 156 -testsdir ${OE_QMAKE_PATH_TESTS} \
188 -examplesdir ${OE_QMAKE_PATH_EXAMPLES} \ 157 -examplesdir ${OE_QMAKE_PATH_EXAMPLES} \
158 -hostprefix ${OE_QMAKE_PATH_HOST_PREFIX} \
159 -hostlibdir ${OE_QMAKE_PATH_HOST_LIBS} \
189 -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ 160 -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \
190 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ 161 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
191 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ 162 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \
192 -platform ${OE_QMAKE_PLATFORM_NATIVE} \ 163 -platform ${OE_QMAKE_PLATFORM_NATIVE} \
193 -xplatform linux-oe-g++ \ 164 -xplatform linux-oe-g++ \
194 ${QT_CONFIG_FLAGS} 165 ${QT_CONFIG_FLAGS}
195
196 qmake5_base_do_configure
197} 166}
198 167
199do_install_append() { 168do_install_append() {
200
201 # Remove example.pro file as it is useless
202 rm -f ${D}${OE_QMAKE_PATH_EXAMPLES}/examples.pro
203
204 # Remove macx-ios-clang directory because /usr/lib/qt5/mkspecs/macx-ios-clang/rename_main.sh:#!/bin/bash
205 # triggers QA Issue: qtbase-mkspecs requires /bin/bash, but no providers in its RDEPENDS [file-rdeps]
206 rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang
207 # and this one has /bin/bash shebang, but checkbashisms doesn't show any reason for it
208 sed -i 's@^#!/bin/bash$@#!/bin/sh@g' ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/data/mac/objc_namespace.sh
209
210 # Replace host paths with qmake built-in properties 169 # Replace host paths with qmake built-in properties
211 sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \ 170 sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \
212 -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ 171 -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
213 ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri 172 ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri
214} 173}
215 174
175# mkspecs have mac specific scripts that depend on perl and bash
176INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
177
216RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 178RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
217 179
218SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd" 180SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 8cf316bf..d45c9d4f 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 = "6c5121eab75e61f807c2df0f14988317f220b945"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 21f6f139..963b8920 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 = "6e224c11080feef2c6d7857d061a92e320e50899"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 67f882ad..71c60af2 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -28,4 +28,4 @@ do_configure_prepend() {
28 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 28 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
29} 29}
30 30
31SRCREV = "8755a1f2460fa523782e27b6ca7a430a0176ac61" 31SRCREV = "9d22c12fe4bc6b19c83aa6cf421b90dbeae5f045"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 50a0bcc6..741626a4 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 = "b6c5569f2158e2f211b90bf36ea964fda7bf6ccc"
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_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 6bab3725..323adefe 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -43,6 +43,6 @@ do_install_append_class-nativesdk() {
43 43
44EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 44EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
45 45
46SRCREV = "d48b397cc79265e80c8437888f9ded0b0364e418" 46SRCREV = "16914894f035963ace51c92de13aad11a53c3cf8"
47 47
48BBCLASSEXTEND =+ "native nativesdk" 48BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index e77d358c..c2455bf1 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -3,16 +3,17 @@ 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=4bfd28363f541b10d9f024181b8df516 \ 6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ 7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ 10 file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
11" 11"
12 12
13DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 13DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
14 14
15SRCREV = "cedca298f081e1c1cdac615eed6171fe687f35e2" 15QT_MODULE_BRANCH = "dev"
16SRCREV = "b0ad5907f480307853f7ac951bacfaa61dcbd94e"
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/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 6c62a683..d0a31caa 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 = "8b5cb6185a014eb65150bef11aebdecb6a723aef"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 7f8179e1..5795cbb6 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_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"
@@ -32,4 +32,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" 33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
34 34
35SRCREV = "d4401c9f519dfe82c38fe9ded674e454655f1866" 35SRCREV = "7795bb6c194692abbca31a9734c83a78362c8063"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 7a9ecb47..46354ba2 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -3,12 +3,12 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" 4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
@@ -29,4 +29,4 @@ do_configure_prepend() {
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31 31
32SRCREV = "4e1008b4ac1eea776585ca41a6a3db127cf500ff" 32SRCREV = "66a6bd9fb20e76ab288e4eef59d06c06a411a471"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 3bbfb6e0..56763f5a 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -38,4 +38,4 @@ SRC_URI += "\
38 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ 38 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
39" 39"
40 40
41SRCREV = "1be4f74843b41f8bc1d1d64e83485f4eb864e8b4" 41SRCREV = "01c9322bfe918b886468eb520d77b21b6d8c0c11"
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..b6f1d050 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 = "c5a44092c8b73c540862c4a160c31487a8518992"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 176035c0..498b4789 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 = "3b093789b07c670e29d3275e26c4e7122db042ae"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index bee833dd..80a8e54b 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 = "52f416f7889c2e63b901eeca07f2c5bda7b27b93"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index af45d89a..a50f2a8e 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 = "df3374bd4bb8af1494f6a35b1102f15cfe9633e0"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 397ac4e9..68f4feab 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 = "7845b1c59bde8e2ec8dc541b9f1c1897182e8d0f"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index d5f37d5f..c9f0e2c3 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 = "0e79f14e56eb43abcb903d5ece41221f6032ef26"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 21e06ff6..9e0c4fb3 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 = "5a00abdefd1c050aae8760dfc01ae5e3631077aa"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 56c1205b..3c66f411 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 = "ea6e06c59e901a5b1fc98bc82d15ba9b85e9faf7"
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..c2592448 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 = "64f3b105fb67d813512b287be6fdaec409d6d943"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 7e2f445e..9ed2449d 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -48,4 +48,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
48 48
49DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 49DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
50 50
51SRCREV = "626e78c9660cff063e1f9370538b5a424631571c" 51SRCREV = "78fa7c11ea79067d819bbcbaa903086eae929015"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index ef6cf0ac..8cc164eb 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -28,4 +28,4 @@ do_install() {
28 oe_runmake install INSTALL_ROOT=${D} 28 oe_runmake install INSTALL_ROOT=${D}
29} 29}
30 30
31SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" 31SRCREV = "3f5111b6c1d92ae4fed008abb53cf4226bfef575"
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 b208961c..1d8df766 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -44,8 +44,4 @@ FILES_${PN}-plugins-dbg += " \
44 ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ 44 ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \
45" 45"
46 46
47SRC_URI += " \ 47SRCREV = "3f5111b6c1d92ae4fed008abb53cf4226bfef575"
48 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
49"
50
51SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 45ac8141..a108a221 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 = "bf66a8531e0ada3ade7e873bc3fae824237acd3e"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 21c9aa38..911d0b35 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -81,7 +81,7 @@ do_configure() {
81 export QMAKE_CACHE_EVAL="${PACKAGECONFIG_CONFARGS}" 81 export QMAKE_CACHE_EVAL="${PACKAGECONFIG_CONFARGS}"
82 82
83 # Disable autodetection from sysroot: 83 # Disable autodetection from sysroot:
84 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 84 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
85 85
86 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as 86 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as
87 # arguments here 87 # arguments here
@@ -109,7 +109,7 @@ RDEPENDS_${PN}-examples += " \
109 qtdeclarative-qmlplugins \ 109 qtdeclarative-qmlplugins \
110" 110"
111 111
112QT_MODULE_BRANCH_CHROMIUM = "49-based" 112QT_MODULE_BRANCH_CHROMIUM = "53-based"
113 113
114SRC_URI += " \ 114SRC_URI += " \
115 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ 115 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
@@ -122,10 +122,8 @@ SRC_URI += " \
122 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 122 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
123" 123"
124 124
125SRCREV_qtwebengine = "dbf7dd27428ff755444eac5e975cb69802ac9771" 125SRCREV_qtwebengine = "6106d6b0b3833e63aeb568f37a47fc6adca8fdb9"
126# This is in git submodule, but we're using the latest in 49-based 126SRCREV_chromium = "8158f645b0cfea734b5ff99777227380f615873f"
127# SRCREV_chromium = "c109a95a067af783e48f93d1cdeca870cda98878"
128SRCREV_chromium = "29c16917b33c26ad32893fa05af971c6c6f50297"
129SRCREV = "${SRCREV_qtwebengine}" 127SRCREV = "${SRCREV_qtwebengine}"
130 128
131SRCREV_FORMAT = "qtwebengine_chromium" 129SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index e5075de6..95446fb0 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 = "1a839b50564782feac2e5dd439686c2a0ed7d985"
diff --git a/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch b/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch
new file mode 100644
index 00000000..bd8d6485
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch
@@ -0,0 +1,37 @@
1From 6f4746e59c3768a56336f202054ec5498a7d376f Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
3Date: Wed, 14 Sep 2016 23:51:14 +0200
4Subject: [PATCH] Remove unused check for the private_headers
5
6TL;DR: it is useless and it breaks the build -> remove
7
8The configuration system in qtbase got changed during the 5.8
9development, and as a result, this won't build anymore. It seems that
10the new syntax is `contains(QT_CONFIG, private_tests)`, but it turns out
11that qt_developer_build is never used anyway.
12
13I did some git archeology and it looks like it was nuked when doing the
145.2 merge from upstream. The original purpose was apparently to control
15-Werror, which is nowadays controlled by CONFIG -= production_build.
16
17Task-number: QTBUG-55950
18Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3
19---
20 Tools/qmake/mkspecs/features/default_pre.prf | 4 ----
21 1 file changed, 4 deletions(-)
22
23diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
24index 6bb52d0..8aa806d 100644
25--- a/Tools/qmake/mkspecs/features/default_pre.prf
26+++ b/Tools/qmake/mkspecs/features/default_pre.prf
27@@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL
28 scratchbox: PYTHON = python2.6
29 else: PYTHON = python
30
31-# We use private_tests to detect developer build, since the destdir will
32-# always be our webkit build dir. This might change as configure changes.
33-qtConfig(private_tests): CONFIG += qt_developer_build
34-
35 # By default we enable "production build", and build-webkit, which is
36 # used by bots and developers, will disable it, to enable warnings etc.
37 CONFIG += production_build
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 78ca1f54..35d9ff58 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -22,6 +22,7 @@ SRC_URI += "\
22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ 22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
23 file://0002-Remove-TEXTREL-tag-in-x86.patch \ 23 file://0002-Remove-TEXTREL-tag-in-x86.patch \
24 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ 24 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \
25 file://0004-Remove-unused-check-for-the-private_headers.patch \
25" 26"
26 27
27PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ 28PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \
@@ -83,4 +84,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
83RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 84RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
84export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 85export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
85 86
86SRCREV = "76e2732f013732461c09a1d6c6b4c77fcab1c0d0" 87SRCREV = "6c536617acb53b03be44bcb84767eb2bf35a16a2"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 8c238db8..4897d257 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 = "ccb138548314a767a897496c74c04a261a391027"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 9a4d6d7d..7ab8f9ca 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 = "448211f022507c6e7787e47aca4b3f12e3f12d94"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index e4c3d7fd..87159e50 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 = "dba42c925db368aa958c38c6a3481f18a57bd71f"
20 20
21BBCLASSEXTEND =+ "native nativesdk" 21BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-06 02:01:25 +0000