summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/qt5-versions.inc4
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb32
-rw-r--r--recipes-qt/qt5/nativesdk-qttools_git.bb13
-rw-r--r--recipes-qt/qt5/qt3d_git.bb9
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch344
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch30
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch56
-rw-r--r--recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch303
-rw-r--r--recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch39
-rw-r--r--recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch30
-rw-r--r--recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch50
-rw-r--r--recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch72
-rw-r--r--recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch30
-rw-r--r--recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch31
-rw-r--r--recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch30
-rw-r--r--recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch29
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb23
-rw-r--r--recipes-qt/qt5/qtbase_git.bb25
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb4
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb10
-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.bb10
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb10
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb10
-rw-r--r--recipes-qt/qt5/qtscript_git.bb10
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb10
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb4
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb10
-rw-r--r--recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch155
-rw-r--r--recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch32
-rw-r--r--recipes-qt/qt5/qttools-native_git.bb10
-rw-r--r--recipes-qt/qt5/qttools_git.bb10
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb6
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb6
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb4
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb4
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb10
41 files changed, 1433 insertions, 70 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index b684a6b8..a2cc1fc3 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -5,11 +5,13 @@ QT5_VERSION ?= "5.2.1"
5 5
6PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" 6PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
7PREFERRED_VERSION_qtbase = "${QT5_VERSION}" 7PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
8PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}"
8PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}" 9PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}"
9PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}" 10PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}"
10PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}" 11PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}"
11PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}" 12PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}"
12PREFERRED_VERSION_qtimageformats = "${QT5_VERSION}" 13PREFERRED_VERSION_qtimageformats = "${QT5_VERSION}"
14PREFERRED_VERSION_qtlocation = "${QT5_VERSION}"
13PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}" 15PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}"
14PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}" 16PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}"
15PREFERRED_VERSION_qtquickcontrols = "${QT5_VERSION}" 17PREFERRED_VERSION_qtquickcontrols = "${QT5_VERSION}"
@@ -17,7 +19,9 @@ PREFERRED_VERSION_qtsensors = "${QT5_VERSION}"
17PREFERRED_VERSION_qtserialport = "${QT5_VERSION}" 19PREFERRED_VERSION_qtserialport = "${QT5_VERSION}"
18PREFERRED_VERSION_qtscript = "${QT5_VERSION}" 20PREFERRED_VERSION_qtscript = "${QT5_VERSION}"
19PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" 21PREFERRED_VERSION_qtsvg = "${QT5_VERSION}"
22PREFERRED_VERSION_qttools = "${QT5_VERSION}"
20PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" 23PREFERRED_VERSION_qttools-native = "${QT5_VERSION}"
24PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}"
21PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" 25PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
22PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" 26PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}"
23PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" 27PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
new file mode 100644
index 00000000..cac16a00
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -0,0 +1,32 @@
1require qt5-git.inc
2require ${PN}.inc
3
4# prepend this again, because ${PN}.inc prepneds ${PN}
5FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
6
7SRC_URI = "\
8 git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
9"
10
11# common with -native
12SRC_URI += "\
13 file://0001-Add-linux-oe-g-platform.patch \
14 file://0002-Add-external-hostbindir-option.patch \
15 file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
16 file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
17 file://0001-Fix-missing-plugin_types.patch \
18 file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
19"
20
21# common with native version
22SRC_URI += " \
23 file://0008-Always-build-uic.patch \
24"
25
26# specific for nativesdk version
27SRC_URI += " \
28 file://0009-configure-preserve-built-qmake-and-swap-with-native-.patch \
29 file://0010-configure-bump-path-length-from-256-to-512-character.patch \
30"
31
32SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb
new file mode 100644
index 00000000..cbf1672a
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qttools_git.bb
@@ -0,0 +1,13 @@
1require qt5-git.inc
2require ${PN}.inc
3
4# prepend this again, because ${PN}.inc prepneds ${PN}
5FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
6
7SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
8
9# older copyright year than what e.g. qtbase is using now
10LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
11 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
12 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index aaa9c04f..0438dd9d 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -4,11 +4,4 @@ require ${PN}.inc
4QT_MODULE_BRANCH = "master" 4QT_MODULE_BRANCH = "master"
5 5
6# last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already 6# last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already
7SRCREV = "d3338a9f7fcac109d7bc7f600d5974ff333782ad" 7SRCREV = "36a829ad6fb44fd01f490c35e011f6fd2470ffdd"
8
9do_configure_prepend() {
10 # Temporary hack to get qt3d build for Qt 5.1.0
11 if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then
12 echo "MODULE_VERSION = 5.3.0" >> ${S}/.qmake.conf
13 fi
14}
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index fa0c06e6..25b7a627 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -10,14 +10,14 @@ SRC_URI += " \
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
13PV = "5.2.1+git${SRCPV}" 13PV = "5.2.1+5.3.0-beta1+git${SRCPV}"
14 14
15FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" 15FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
16 16
17DEFAULT_PREFERENCE = "-1" 17DEFAULT_PREFERENCE = "-1"
18 18
19LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" 19LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
20LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ 20LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=2abca611d56c23eb99943bde21c80a0d \
21 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ 21 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
22 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ 22 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
23 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" 23 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
new file mode 100644
index 00000000..828f5ea5
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -0,0 +1,344 @@
1From 237a4b0143d91c0573ecf6f9ff5e37827a14a75d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH 01/10] Add linux-oe-g++ platform
5
6* This qmake.conf unlike other platforms reads most variables from
7 shell environment, because it's easier for qt recipes to export
8 *FLAGS or CC specific for given recipe
9
10* configure: add getQEvalMakeConf and getXQEvalMakeConf
11 Allow expansion of $(...) references from qmake.conf to generate
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
18* 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
20 Makefiles used in configure tests and also Makefiles to build the application
21
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]
41 too OE specific, probably cannot be upstreamed
42
43Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
44---
45 configure | 60 +++++++++++++++------
46 mkspecs/features/configure.prf | 4 +-
47 mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
48 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
49 4 files changed, 185 insertions(+), 19 deletions(-)
50 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
51 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
52
53diff --git a/configure b/configure
54index 55d68ef..bb24a9c 100755
55--- a/configure
56+++ b/configure
57@@ -324,6 +324,16 @@ getQMakeConf()
58 getSingleQMakeVariable "$1" "$specvals"
59 }
60
61+# OE qmake.conf is reading some variables from shell env
62+# read them from qmake.conf, replace qmake () syntax with shell and eval
63+getQEvalMakeConf()
64+{
65+ VAL=`getQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
66+ EVAL=`eval "echo ${VAL}"`
67+# echo "Running getQEvalMakeConf: var='$1', val='`getQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
68+ eval "echo ${VAL}"
69+}
70+
71 getXQMakeConf()
72 {
73 if [ -z "$xspecvals" ]; then
74@@ -333,6 +343,16 @@ getXQMakeConf()
75 getSingleQMakeVariable "$1" "$xspecvals"
76 }
77
78+# OE qmake.conf is reading some variables from shell env
79+# read them from qmake.conf, replace qmake () syntax with shell and eval
80+getXQEvalMakeConf()
81+{
82+ VAL=`getXQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
83+ EVAL=`eval "echo ${VAL}"`
84+# echo "Running getXQEvalMakeConf: var='$1', val='`getXQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
85+ eval "echo ${VAL}"
86+}
87+
88 compilerSupportsFlag()
89 {
90 cat >conftest.cpp <<EOF
91@@ -548,21 +568,19 @@ fi
92 # initalize variables
93 #-------------------------------------------------------------------------------
94
95-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
96-for varname in $SYSTEM_VARIABLES; do
97+# Export all OE variables for qmake.conf from shell env to QMakeVars
98+OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP"
99+for varname in $OE_VARIABLES; do
100 qmakevarname="${varname}"
101- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
102- if [ "${varname}" = "LDFLAGS" ]; then
103- qmakevarname="LFLAGS"
104- elif [ "${varname}" = "LD" ]; then
105- qmakevarname="LINK"
106- fi
107 cmd=`echo \
108-'if [ -n "\$'${varname}'" ]; then
109- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'"
110+'if [ -n "\$OE_QMAKE_'${varname}'" ]; then
111+ QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'"
112+# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2
113 fi'`
114 eval "$cmd"
115 done
116+
117+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
118 # Use CC/CXX to run config.tests
119 mkdir -p "$outpath/config.tests"
120 rm -f "$outpath/config.tests/.qmake.cache"
121@@ -3139,7 +3157,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
122 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
123 fi
124
125-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
126+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX`
127
128 TEST_COMPILER=$QMAKE_CONF_COMPILER
129
130@@ -3174,7 +3192,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
131 exit 1
132 fi
133 fi
134-TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS`
135+TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS`
136
137 GCC_MACHINE_DUMP=
138 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
139@@ -3632,6 +3650,14 @@ setBootstrapVariable()
140 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
141 }
142
143+# OE qmake.conf is reading some variables from shell env
144+# read them from qmake.conf, replace qmake () syntax with shell and eval
145+setBootstrapEvalVariable()
146+{
147+ getQEvalMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
148+}
149+
150+
151 # build qmake
152 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
153 echo "Creating qmake..."
154@@ -3670,11 +3696,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
155 fi
156
157 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
158- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
159- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
160- setBootstrapVariable QMAKE_CFLAGS
161- setBootstrapVariable QMAKE_CXXFLAGS
162- setBootstrapVariable QMAKE_LFLAGS
163+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM"
164+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM"
165+ setBootstrapEvalVariable QMAKE_CFLAGS
166+ setBootstrapEvalVariable QMAKE_CXXFLAGS
167+ setBootstrapEvalVariable QMAKE_LFLAGS
168
169 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
170 setBootstrapVariable QMAKE_CFLAGS_RELEASE
171diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
172index fe41c54..e2db923 100644
173--- a/mkspecs/features/configure.prf
174+++ b/mkspecs/features/configure.prf
175@@ -60,12 +60,12 @@ defineTest(qtCompileTest) {
176 }
177
178 # Clean up after previous run
179- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
180+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean")
181
182 mkpath($$test_out_dir)|error("Aborting.")
183
184 qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") {
185- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") {
186+ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") {
187 log("yes$$escape_expand(\\n)")
188 msg = "test $$1 succeeded"
189 write_file($$QMAKE_CONFIG_LOG, msg, append)
190diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
191new file mode 100644
192index 0000000..ca26b10
193--- /dev/null
194+++ b/mkspecs/linux-oe-g++/qmake.conf
195@@ -0,0 +1,40 @@
196+#
197+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
198+#
199+
200+MAKEFILE_GENERATOR = UNIX
201+CONFIG += incremental
202+QMAKE_INCREMENTAL_STYLE = sublib
203+
204+include(../common/linux.conf)
205+
206+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
207+QMAKE_AR = $(OE_QMAKE_AR) cqs
208+QMAKE_STRIP = $(OE_QMAKE_STRIP)
209+QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER)
210+
211+include(../common/gcc-base-unix.conf)
212+
213+# *FLAGS from gcc-base.conf
214+QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS)
215+QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS)
216+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
217+
218+include(../common/g++-unix.conf)
219+
220+# tc settings from g++-base.conf
221+QMAKE_COMPILER = $(OE_QMAKE_COMPILER)
222+QMAKE_CC = $(OE_QMAKE_CC)
223+QMAKE_CXX = $(OE_QMAKE_CXX)
224+
225+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
226+
227+QMAKE_LINK = $(OE_QMAKE_LINK)
228+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
229+QMAKE_LINK_C = $(OE_QMAKE_LINK)
230+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
231+
232+# for the SDK
233+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
234+
235+load(qt_config)
236diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
237new file mode 100644
238index 0000000..dd12003
239--- /dev/null
240+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
241@@ -0,0 +1,100 @@
242+/****************************************************************************
243+**
244+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
245+** Contact: http://www.qt-project.org/legal
246+**
247+** This file is part of the qmake spec of the Qt Toolkit.
248+**
249+** $QT_BEGIN_LICENSE:LGPL$
250+** Commercial License Usage
251+** Licensees holding valid commercial Qt licenses may use this file in
252+** accordance with the commercial license agreement provided with the
253+** Software or, alternatively, in accordance with the terms contained in
254+** a written agreement between you and Digia. For licensing terms and
255+** conditions see http://qt.digia.com/licensing. For further information
256+** use the contact form at http://qt.digia.com/contact-us.
257+**
258+** GNU Lesser General Public License Usage
259+** Alternatively, this file may be used under the terms of the GNU Lesser
260+** General Public License version 2.1 as published by the Free Software
261+** Foundation and appearing in the file LICENSE.LGPL included in the
262+** packaging of this file. Please review the following information to
263+** ensure the GNU Lesser General Public License version 2.1 requirements
264+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
265+**
266+** In addition, as a special exception, Digia gives you certain additional
267+** rights. These rights are described in the Digia Qt LGPL Exception
268+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
269+**
270+** GNU General Public License Usage
271+** Alternatively, this file may be used under the terms of the GNU
272+** General Public License version 3.0 as published by the Free Software
273+** Foundation and appearing in the file LICENSE.GPL included in the
274+** packaging of this file. Please review the following information to
275+** ensure the GNU General Public License version 3.0 requirements will be
276+** met: http://www.gnu.org/copyleft/gpl.html.
277+**
278+**
279+** $QT_END_LICENSE$
280+**
281+****************************************************************************/
282+
283+#ifndef QPLATFORMDEFS_H
284+#define QPLATFORMDEFS_H
285+
286+// Get Qt defines/settings
287+
288+#include "qglobal.h"
289+
290+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
291+
292+// 1) need to reset default environment if _BSD_SOURCE is defined
293+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
294+// 3) it seems older glibc need this to include the X/Open stuff
295+#ifndef _GNU_SOURCE
296+# define _GNU_SOURCE
297+#endif
298+
299+#include <unistd.h>
300+
301+
302+// We are hot - unistd.h should have turned on the specific APIs we requested
303+
304+#include <features.h>
305+#include <pthread.h>
306+#include <dirent.h>
307+#include <fcntl.h>
308+#include <grp.h>
309+#include <pwd.h>
310+#include <signal.h>
311+
312+#include <sys/types.h>
313+#include <sys/ioctl.h>
314+#include <sys/ipc.h>
315+#include <sys/time.h>
316+#include <sys/shm.h>
317+#include <sys/socket.h>
318+#include <sys/stat.h>
319+#include <sys/wait.h>
320+#include <netinet/in.h>
321+#ifndef QT_NO_IPV6IFNAME
322+#include <net/if.h>
323+#endif
324+
325+#define QT_USE_XOPEN_LFS_EXTENSIONS
326+#include "../common/posix/qplatformdefs.h"
327+
328+#undef QT_SOCKLEN_T
329+
330+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
331+#define QT_SOCKLEN_T socklen_t
332+#else
333+#define QT_SOCKLEN_T int
334+#endif
335+
336+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
337+#define QT_SNPRINTF ::snprintf
338+#define QT_VSNPRINTF ::vsnprintf
339+#endif
340+
341+#endif // QPLATFORMDEFS_H
342--
3431.9.1
344
diff --git a/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
new file mode 100644
index 00000000..612cbdda
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
@@ -0,0 +1,30 @@
1From f0e01b788e86f24352ba14ad17c3f337f934467d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 21 Apr 2014 15:09:23 +0200
4Subject: [PATCH] Fix missing plugin_types
5
6* bearer/generic was failing with:
7 Project ERROR: No module claims plugin type 'bearer'
8
9Change-Id: I90848856a8b0a4df52e599983cf7dde0bc0e6623
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 mkspecs/features/qt_module_pris.prf | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
16index f31bc38..415e780 100644
17--- a/mkspecs/features/qt_module_pris.prf
18+++ b/mkspecs/features/qt_module_pris.prf
19@@ -177,7 +177,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
20 include($$mod_work_pfx/qt_lib_$${pri}.pri)
21 for(mod, mods_to_load) {
22 for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
23- name depends module_config CONFIG DEFINES sources \
24+ name depends module_config plugin_types CONFIG DEFINES sources \
25 includes bins libs libexecs plugins imports qml \
26 rpath_link \
27 )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient)
28--
291.9.1
30
diff --git a/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
new file mode 100644
index 00000000..65ebbd1c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -0,0 +1,56 @@
1From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 21 Apr 2014 19:22:04 +0200
4Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode"
5
6This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
7---
8 src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++-
9 src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 -------
10 2 files changed, 3 insertions(+), 8 deletions(-)
11
12diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
13index e6624fb..3870f6c 100644
14--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
15+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
16@@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
17 for (index = 0; attrs[index].attr != -1; ++index) {
18 EGLint value;
19 if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) {
20- qDebug("\t%s: %d", attrs[index].name, (int)value);
21+ qWarning("\t%s: %d\n", attrs[index].name, (int)value);
22 }
23 }
24+
25+ qWarning("\n");
26 }
27
28 #ifdef Q_OS_LINUX
29diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
30index eec6463..4a7c69b 100644
31--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
32+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
33@@ -44,7 +44,6 @@
34 #include "qeglpbuffer_p.h"
35 #include <qpa/qplatformwindow.h>
36 #include <QOpenGLContext>
37-#include <QDebug>
38
39 QT_BEGIN_NAMESPACE
40
41@@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont
42 return;
43 }
44
45- static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt();
46- if (printConfig) {
47- qDebug() << "Created context for format" << format << "with config:";
48- q_printEglConfig(m_eglDisplay, m_eglConfig);
49- }
50-
51 #ifndef QT_NO_OPENGL
52 // Make the context current to ensure the GL version query works. This needs a surface too.
53 const EGLint pbufferAttributes[] = {
54--
551.9.1
56
diff --git a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
new file mode 100644
index 00000000..5f9fd90d
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
@@ -0,0 +1,303 @@
1From 00ad866f82f89ce938e9eaabfc50af3cde72ccfe Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 02/10] Add -external-hostbindir option
5
6* when cross-compiling it's sometimes useful to use existing tools from machine
7 (or in OpenEmbedded built with separate native recipe) when building for target
8
9* this way we can skip bootstraping tools we already have
10
11* qt_functions: temporary remove isEmpty check
12* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
13* isEmpty works correctly only with qmake variables (e.g. $$FOO -
14 isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
15
16* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries
17
18Upstream-Status: Pending
19 is a lot better for upstreaming (and it was already sort of approved by
20 Oswald) but in 5.2.0 I've noticed that he added something similar for
21 android builds
22
23Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
24Signed-off-by: Simon Busch <morphis@gravedo.de>
25---
26 configure | 15 +++++++++++++++
27 mkspecs/features/qt_functions.prf | 9 ++++++++-
28 mkspecs/features/qt_tool.prf | 3 +--
29 qmake/property.cpp | 1 +
30 qtbase.pro | 12 +++++++++---
31 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
32 src/corelib/global/qlibraryinfo.cpp | 3 ++-
33 src/corelib/global/qlibraryinfo.h | 1 +
34 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
35 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
36 tools/configure/configureapp.cpp | 8 ++++++++
37 11 files changed, 51 insertions(+), 13 deletions(-)
38
39diff --git a/configure b/configure
40index bb24a9c..bf7c11e 100755
41--- a/configure
42+++ b/configure
43@@ -777,6 +777,7 @@ QT_HOST_BINS=
44 QT_HOST_LIBS=
45 QT_HOST_DATA=
46 QT_EXT_PREFIX=
47+QT_EXTERNAL_HOST_BINS=
48
49 #flags for SQL drivers
50 QT_CFLAGS_PSQL=
51@@ -898,6 +899,7 @@ while [ "$#" -gt 0 ]; do
52 -testsdir| \
53 -hostdatadir| \
54 -hostbindir| \
55+ -external-hostbindir| \
56 -hostlibdir| \
57 -extprefix| \
58 -sysroot| \
59@@ -1112,6 +1114,9 @@ while [ "$#" -gt 0 ]; do
60 extprefix)
61 QT_EXT_PREFIX="$VAL"
62 ;;
63+ external-hostbindir)
64+ QT_EXTERNAL_HOST_BINS="$VAL"
65+ ;;
66 pkg-config)
67 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
68 CFG_PKGCONFIG="$VAL"
69@@ -2250,6 +2255,10 @@ Installation options:
70 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
71 (default HOSTPREFIX)
72
73+ -external-hostbindir <dir> Use external host executables instead of building them
74+ (not used by defaut)
75+
76+
77 Configure options:
78
79 The defaults (*) are usually acceptable. A plus (+) denotes a default value
80@@ -2914,6 +2923,11 @@ fi
81 # command line and environment validation
82 #-------------------------------------------------------------------------------
83
84+# default is empty, don't call makeabs if it is empty
85+if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
86+ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
87+fi
88+
89 # update QT_CONFIG to show our current predefined configuration
90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
91 case "$CFG_QCONFIG" in
92@@ -3594,6 +3608,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
93 "qt_hbinpath=$QT_HOST_BINS",
94 "qt_hlibpath=$QT_HOST_LIBS",
95 "qt_hdatpath=$QT_HOST_DATA",
96+ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS",
97 "qt_targspec=$shortxspec",
98 "qt_hostspec=$shortspec",
99 #endif
100diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
101index 1dacfed..7229845 100644
102--- a/mkspecs/features/qt_functions.prf
103+++ b/mkspecs/features/qt_functions.prf
104@@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) {
105 defineTest(qtPrepareTool) {
106 $$1 = $$eval(QT_TOOL.$${2}.binary)
107 isEmpty($$1) {
108- $$1 = $$[QT_HOST_BINS]/$$2
109+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
110+ # for some reason isEmpty does not work here, FIXME before submitting upstream
111+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
112+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
113+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
114+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
115+ $$1 = $$[QT_HOST_BINS]/$$2
116+ }
117 exists($$eval($$1).pl) {
118 $$1 = perl -w $$eval($$1).pl
119 } else: contains(QMAKE_HOST.os, Windows) {
120diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
121index f0864f9..50bfac8 100644
122--- a/mkspecs/features/qt_tool.prf
123+++ b/mkspecs/features/qt_tool.prf
124@@ -15,8 +15,7 @@ CONFIG += console
125
126 # If we are doing a prefix build, create a "module" pri which enables
127 # qtPrepareTool() to work with the non-installed build.
128-# Non-bootstrapped tools always need this because of the environment setup.
129-!build_pass:if(!host_build|!force_bootstrap|force_independent) {
130+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
131 isEmpty(MODULE):MODULE = $$TARGET
132
133 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private)
134diff --git a/qmake/property.cpp b/qmake/property.cpp
135index e50485c..71291ad 100644
136--- a/qmake/property.cpp
137+++ b/qmake/property.cpp
138@@ -75,6 +75,7 @@ static const struct {
139 { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
140 { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true },
141 { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true },
142+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true },
143 { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true },
144 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
145 };
146diff --git a/qtbase.pro b/qtbase.pro
147index ed6fc39..2421f41 100644
148--- a/qtbase.pro
149+++ b/qtbase.pro
150@@ -71,16 +71,22 @@ CONFIG -= qt
151
152 #qmake
153 qmake.path = $$[QT_HOST_BINS]
154+qmake.files = $$OUT_PWD/bin/qmake
155+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
156+ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/qmake
157+}
158 equals(QMAKE_HOST.os, Windows) {
159- qmake.files = $$OUT_PWD/bin/qmake.exe
160-} else {
161- qmake.files = $$OUT_PWD/bin/qmake
162+ qmake.files = $${qmake.files}.exe
163 }
164 INSTALLS += qmake
165
166 #syncqt
167 syncqt.path = $$[QT_HOST_BINS]
168 syncqt.files = $$PWD/bin/syncqt.pl
169+syncqt.files = $$PWD/bin/syncqt.pl
170+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
171+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl
172+}
173 INSTALLS += syncqt
174
175 # If we are doing a prefix build, create a "module" pri which enables
176diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
177index 9bda70e..6e3605a 100644
178--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
179+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
180@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
181 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
182 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
183 !!ELSE
184- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
185+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\")
186 !!ENDIF
187 _qt5_Core_check_file_exists(${imported_location})
188
189@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc)
190 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
191 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
192 !!ELSE
193- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
194+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\")
195 !!ENDIF
196 _qt5_Core_check_file_exists(${imported_location})
197
198@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc)
199 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
200 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
201 !!ELSE
202- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
203+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\")
204 !!ENDIF
205 _qt5_Core_check_file_exists(${imported_location})
206
207diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
208index 6d25325..3686b17 100644
209--- a/src/corelib/global/qlibraryinfo.cpp
210+++ b/src/corelib/global/qlibraryinfo.cpp
211@@ -333,7 +333,7 @@ QLibraryInfo::isDebugBuild()
212 */
213
214 static const struct {
215- char key[19], value[13];
216+ char key[21], value[13];
217 } qtConfEntries[] = {
218 { "Prefix", "." },
219 { "Documentation", "doc" }, // should be ${Data}/doc
220@@ -359,6 +359,7 @@ static const struct {
221 { "HostBinaries", "bin" },
222 { "HostLibraries", "lib" },
223 { "HostData", "." },
224+ { "ExternalHostBinaries", "" },
225 { "TargetSpec", "" },
226 { "HostSpec", "" },
227 #endif
228diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
229index 0b573c2..b5535ee 100644
230--- a/src/corelib/global/qlibraryinfo.h
231+++ b/src/corelib/global/qlibraryinfo.h
232@@ -88,6 +88,7 @@ public:
233 HostBinariesPath,
234 HostLibrariesPath,
235 HostDataPath,
236+ ExternalHostBinariesPath,
237 TargetSpecPath,
238 HostSpecPath,
239 LastHostPath = HostSpecPath,
240diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
241index 1d94715..301af8f 100644
242--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
243+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
244@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
245 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
246 set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
247 !!ELSE
248- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
249+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
250 !!ENDIF
251 _qt5_DBus_check_file_exists(${imported_location})
252
253@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
254 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
255 set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
256 !!ELSE
257- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
258+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
259 !!ENDIF
260 _qt5_DBus_check_file_exists(${imported_location})
261
262diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
263index 99d87e2..5621dc0 100644
264--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
265+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
266@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
267 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
268 set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
269 !!ELSE
270- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
271+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\")
272 !!ENDIF
273 _qt5_Widgets_check_file_exists(${imported_location})
274
275diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
276index cff3f1b..540708b 100644
277--- a/tools/configure/configureapp.cpp
278+++ b/tools/configure/configureapp.cpp
279@@ -1213,6 +1213,13 @@ void Configure::parseCmdLine()
280 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
281 }
282
283+ else if (configCmdLine.at(i) == "-external-hostbindir") {
284+ ++i;
285+ if (i == argCount)
286+ break;
287+ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i);
288+ }
289+
290 else if (configCmdLine.at(i) == "-make-tool") {
291 ++i;
292 if (i == argCount)
293@@ -3986,6 +3993,7 @@ void Configure::generateQConfigCpp()
294 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
295 << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
296 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
297+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl
298 << " \"qt_targspec=" << targSpec << "\"," << endl
299 << " \"qt_hostspec=" << hostSpec << "\"," << endl
300 << "#endif" << endl
301--
3021.9.1
303
diff --git a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
new file mode 100644
index 00000000..95c67a88
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -0,0 +1,39 @@
1From 53b152be24082a2cf2497d2e687f9ee73a39d6f4 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 03/10] qlibraryinfo: allow to set qt.conf from the outside
5 using the environment
6
7Allow to set a qt.conf from the outside using the environment. This allows
8to inject new prefixes and other paths into qmake. This is needed when using
9the same qmake binary to build qt/x11 and qt/embedded
10
11Upstream-Status: Inappropriate [embedded specific]
12 again very OE specific to read everything from environment (reusing the same
13 qmake from sstate and replacing all configured paths in it with qt.conf from
14 environment).
15
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 src/corelib/global/qlibraryinfo.cpp | 5 ++++-
19 1 file changed, 4 insertions(+), 1 deletion(-)
20
21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
22index 3686b17..89e13cf 100644
23--- a/src/corelib/global/qlibraryinfo.cpp
24+++ b/src/corelib/global/qlibraryinfo.cpp
25@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings()
26
27 QSettings *QLibraryInfoPrivate::findConfiguration()
28 {
29- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
30+ QByteArray config = getenv("QT_CONF_PATH");
31+ QString qtconfig = QFile::decodeName(config);
32+ if(!QFile::exists(qtconfig))
33+ qtconfig = QStringLiteral(":/qt/etc/qt.conf");
34 #ifdef QT_BOOTSTRAPPED
35 if(!QFile::exists(qtconfig))
36 qtconfig = qt_libraryInfoFile();
37--
381.9.1
39
diff --git a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
new file mode 100644
index 00000000..c263d094
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -0,0 +1,30 @@
1From a39f5e64b7b5a31e7e5cd988b5f967ce6cf02990 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:33:33 +0200
4Subject: [PATCH 04/10] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT
6
7Upstream-Status: Pending
8 again a bit OE specific
9---
10 tools/configure/configureapp.cpp | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
14index 540708b..45f4a1e 100644
15--- a/tools/configure/configureapp.cpp
16+++ b/tools/configure/configureapp.cpp
17@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri()
18 configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
19 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
20 // FIXME: add detection
21- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
22- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
23+ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
24+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
25 }
26 configStream << "}" << endl;
27 configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
28--
291.9.1
30
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
new file mode 100644
index 00000000..395e84cc
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -0,0 +1,50 @@
1From c0c4c468cc70a367e3bb2dd4a48c31e62b3b0fa4 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 05/10] qmake: don't build it in configure, but allow to build
5 it separately
6
7* it is already built in qtbase-native, so we don't need it in configure
8* allow building a separate qmake for the target
9
10Upstream-Status: Inappropriate [configuration]
11 OE specific for native/target builds
12
13Signed-off-by: Yu Ke <ke.yu@intel.com>
14Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
15Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 configure | 2 +-
19 qmake/qmake.pro | 2 ++
20 2 files changed, 3 insertions(+), 1 deletion(-)
21
22diff --git a/configure b/configure
23index bf7c11e..5e93ce4 100755
24--- a/configure
25+++ b/configure
26@@ -3674,7 +3674,7 @@ setBootstrapEvalVariable()
27
28
29 # build qmake
30-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
31+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
32 echo "Creating qmake..."
33
34 mkdir -p "$outpath/qmake" || exit
35diff --git a/qmake/qmake.pro b/qmake/qmake.pro
36index 89d6ea5..7c605b9 100644
37--- a/qmake/qmake.pro
38+++ b/qmake/qmake.pro
39@@ -8,6 +8,8 @@ CONFIG -= qt
40 DEFINES += \
41 QT_BUILD_QMAKE \
42 PROEVALUATOR_FULL
43+DESTDIR = ../bin/
44+TARGET = qmake
45
46 VPATH += \
47 ../src/corelib/global \
48--
491.9.1
50
diff --git a/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
new file mode 100644
index 00000000..21821c38
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -0,0 +1,72 @@
1From 2cb0f75bb9ab1e6709fe867887f9e6014a140356 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 5 Feb 2014 18:35:08 +0100
4Subject: [PATCH 06/10] eglfs: fix egl error for platforms only supporting one
5 window/surface
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10running qmlscene -platform eglfs <filename>.qml
11
12caused
13
14EGL Error : Could not create the egl surface: error = 0x3003
15
16Rebased version of [1-2]
17
18Upstream-Status: unknown
19
20[1] http://repository.timesys.com/buildsources/q/qt-everywhere-opensource/qt-everywhere-opensource-5.1.1/qt-everywhere-opensource-5.1.1-qeglfswindow.cpp.patch
21[2] https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch
22
23Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
24Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
25---
26 src/plugins/platforms/eglfs/qeglfswindow.cpp | 16 +++++++++++++++-
27 1 file changed, 15 insertions(+), 1 deletion(-)
28
29diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
30index 2d36c0b..854531e 100644
31--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
32+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
33@@ -74,6 +74,15 @@ void QEglFSWindow::create()
34
35 m_flags = Created;
36
37+ static EGLSurface __singleWindowSurface;
38+ if(QEglFSHooks::hooks() && ! QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface)) {
39+ m_surface = __singleWindowSurface;
40+#ifdef QEGL_EXTRA_DEBUG
41+ qWarning("Surface recreate request, re-using %x\n", m_surface);
42+#endif
43+ return;
44+ }
45+
46 if (window()->type() == Qt::Desktop)
47 return;
48
49@@ -85,7 +94,7 @@ void QEglFSWindow::create()
50 if (isRaster() && screen->compositingWindow())
51 return;
52
53-#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK)
54+#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB)
55 // We can have either a single OpenGL window or multiple raster windows.
56 // Other combinations cannot work.
57 qFatal("EGLFS: OpenGL windows cannot be mixed with others.");
58@@ -105,6 +114,11 @@ void QEglFSWindow::create()
59
60 resetSurface();
61
62+ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows))
63+ {
64+ __singleWindowSurface = m_surface;
65+ }
66+
67 screen->setPrimarySurface(m_surface);
68
69 if (isRaster()) {
70--
711.9.1
72
diff --git a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
new file mode 100644
index 00000000..24ae7ea4
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -0,0 +1,30 @@
1From 0923f72a444bcdc0675a24aec9782692b41d301c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 19 Mar 2014 18:32:28 +0100
4Subject: [PATCH 07/10] qeglplatformintegration: Undefine CursorShape from X.h
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++
9 1 file changed, 6 insertions(+)
10
11diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
12index f665455..9eb783c 100644
13--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
14+++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
15@@ -46,6 +46,12 @@
16 #include <qpa/qplatformnativeinterface.h>
17 #include <EGL/egl.h>
18
19+// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/
20+// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */
21+#ifdef CursorShape
22+#undef CursorShape
23+#endif
24+
25 QT_BEGIN_NAMESPACE
26
27 class QEGLPlatformScreen;
28--
291.9.1
30
diff --git a/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
new file mode 100644
index 00000000..fd45516a
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
@@ -0,0 +1,31 @@
1From 4d5502114a3135f2c78eb9e63476918cbee00040 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH 08/10] Always build uic
5
6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target.
8
9Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
10Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 src/src.pro | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/src.pro b/src/src.pro
17index 6a805a6..90623a6 100644
18--- a/src/src.pro
19+++ b/src/src.pro
20@@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 }
22 }
23 }
24-SUBDIRS += src_plugins src_tools_qdoc
25+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
26
27 nacl: SUBDIRS -= src_network src_testlib
28
29--
301.9.1
31
diff --git a/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
new file mode 100644
index 00000000..ddd7116f
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -0,0 +1,30 @@
1From 7117e71f5e1aac3ac6e5e87852c108bbc13dc364 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Mon, 11 Nov 2013 20:22:34 -0500
4Subject: [PATCH 09/10] configure: preserve built qmake and swap with native
5 one
6
7Let configure script build the real qmake, but right after it's built, swap
8it with a native qmake for further internal use, preserving the real one.
9
10Signed-off-by: Denys Dmytriyenko <denys@ti.com>
11---
12 configure | 2 ++
13 1 file changed, 2 insertions(+)
14
15diff --git a/configure b/configure
16index 5e93ce4..01fca8f 100755
17--- a/configure
18+++ b/configure
19@@ -3821,6 +3821,8 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ];
20
21 (cd "$outpath/qmake"; "$MAKE") || exit 2
22 fi # Build qmake
23+mv "$outpath/bin/qmake" "$outpath/bin/qmake-real"
24+mv "$outpath/bin/qmake-native" "$outpath/bin/qmake"
25
26 echo "Running configuration tests..."
27
28--
291.9.1
30
diff --git a/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
new file mode 100644
index 00000000..02eef9bf
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
@@ -0,0 +1,29 @@
1From 6afe8d5d1daf94ac64478406b5b84b6879981446 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Mon, 11 Nov 2013 20:27:30 -0500
4Subject: [PATCH 10/10] configure: bump path length from 256 to 512 characters
5
6Increase the path length that gets hardcoded into generated config.cpp file
7from 256 to 512 characters, as nativesdk path can be quite long.
8
9Signed-off-by: Denys Dmytriyenko <denys@ti.com>
10---
11 configure | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/configure b/configure
15index 01fca8f..801c7c1 100755
16--- a/configure
17+++ b/configure
18@@ -3572,7 +3572,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
19 static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`";
20
21 /* Installation Info */
22-static const char qt_configure_prefix_path_strs[][256 + 12] = {
23+static const char qt_configure_prefix_path_strs[][512 + 12] = {
24 #ifndef QT_BUILD_QMAKE
25 "qt_prfxpath=$QT_SYSROOT_PREFIX",
26 "qt_docspath=$QT_SYSROOT_DOCS",
27--
281.9.1
29
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 6f11bf3a..bafe37ba 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -1,12 +1,29 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRC_URI = "\
5 git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
6"
7
8# common with -native
9SRC_URI += "\
10 file://0001-Add-linux-oe-g-platform.patch \
11 file://0002-Add-external-hostbindir-option.patch \
12 file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
13 file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
14 file://0001-Fix-missing-plugin_types.patch \
15 file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
16"
17
18# specific for native version
19SRC_URI += " \
20 file://0008-Always-build-uic.patch \
21"
22
4do_install_append() { 23do_install_append() {
5 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) 24 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
6 # e.g. qt3d, qtwayland 25 # e.g. qt3d, qtwayland
7 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 26 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
8} 27}
9 28
10QT_MODULE_BRANCH = "release" 29SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
11# v5.2.1 + 168 commits
12SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 07dd936d..9bcfa791 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -1,6 +1,25 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRC_URI = "\
5# v5.2.1 + 172 commits 5 git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
6SRCREV = "bf0336a02502b3ed4d399c1cf5b4a56b1e858d42" 6"
7
8# common with -native
9SRC_URI += "\
10 file://0001-Add-linux-oe-g-platform.patch \
11 file://0002-Add-external-hostbindir-option.patch \
12 file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
13 file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
14 file://0001-Fix-missing-plugin_types.patch \
15 file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
16"
17
18# target specific
19SRC_URI += "\
20 file://0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
21 file://0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
22 file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
23"
24
25SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 35e54d32..c0fd15d8 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${BPN}.inc 2require ${BPN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "6d9ab3981a1ae9e224b3c6a8cf107049a0ee5095"
5# v5.2.1 + 25 commits
6SRCREV = "9902dfdbc44934ce2e8072bc237ca8cdbfb3402b"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index e2d6ae58..2d733a3f 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "aedcd57c84ac9d6b74816c13bdf3fde31e1132b5"
5# v5.2.1 + 81 commits 5
6SRCREV = "7ceefa60ab4f79d5f40e7051edf80c1a77ae7734" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index b442069f..9347e7b3 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "9b1883d2e90dd6ef92374d21e490a3de1c8330ba"
5# v5.2.1 + 3 commits 5
6SRCREV = "1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc3" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index e40bd3fd..b413a5f4 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "554d617762c86964dfa074074304993ccdfbe2c9"
5# v5.2.1 + 1 commits 5
6SRCREV = "dde6daeccdf0a3f8d49fe1777b49046576b12218" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index e4985151..bab82750 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "27c9ffe1d2eb2103e9b420c86c6fc3d10cb1ff76"
5# v5.2.1 + 13 commits 5
6SRCREV = "2ba9fd5550eb7766c20b3a61679e88ec4a6c8a54" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index e9fed1ab..88ca59ea 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "b088962950dbc4c6f0219de30b0d9a8cf47a3376"
5# v5.2.1 + 17 commits 5
6SRCREV = "db7f7cc5654ddec60297259bc9f86f5f777749cd" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index d744aa8d..7c64460e 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "c56f5d8848ce03cc6667804f815de47d2d8221fb"
5# v5.2.1 + 2 commits 5
6SRCREV = "07d8ce32b1112dcb590c793ee51cb713e514011b" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 69c3353b..fd525f14 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "ea9add905768a26ce86ab542615a193296642732"
5# v5.2.1 + 15 commits 5
6SRCREV = "1c54d411ad6e98c3779a412750aec8b93d587872" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 2b86650c..2deaaff0 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "e4453c92ee41943a3a1d67a725804a44e747f64e"
5# v5.2.1 + 1 commits 5
6SRCREV = "f89d64ca722acf4a1a38c5e136bb01eff2525978" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index aedcc40e..6e3bda6e 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "eee2eee734b4aa735d35f6c53d79c06c1c76425a"
5# v5.2.1 + 2 commits 5
6SRCREV = "9a8319a39a06d6cf3163978301d650b8f3558c62" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 3418259b..46192276 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "6e75610dff5fb96ebd72cfb40ba7cbfea4bd21b7"
5# v5.2.1 + 28 commits
6SRCREV = "03546732fa696467d23b24224fad2822bc6a9043"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index b6032b75..0aa79e19 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "ad81f5720c4f4a1dac099cbe2f9d47ed3a9025b0"
5# v5.2.1 + 1 commits 5
6SRCREV = "ae68091e0d6023410bc657cf54e7fa9b6c8bbcc2" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
new file mode 100644
index 00000000..575616b2
--- /dev/null
+++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -0,0 +1,155 @@
1From 90a2e92062fc67fa54be0f5596606ce2bc21f772 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert
5
6This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
7is built without GUI support (no-png is set) and we still want to build
8native lrelease + lupdate + lconvert tools.
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.jansa@gmail.com>
13---
14 examples/examples.pro | 4 ++--
15 src/designer/src/src.pro | 16 +++++++++-------
16 src/linguist/linguist.pro | 2 +-
17 src/src.pro | 14 ++++++++------
18 tests/auto/auto.pro | 24 +++++++++++++-----------
19 5 files changed, 33 insertions(+), 27 deletions(-)
20
21diff --git a/examples/examples.pro b/examples/examples.pro
22index 4955969..8e86419 100644
23--- a/examples/examples.pro
24+++ b/examples/examples.pro
25@@ -1,3 +1,3 @@
26 TEMPLATE = subdirs
27-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
28-
29+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant
30+qtHaveModule(widgets): SUBDIRS += linguist uitools
31diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
32index e02ca8e..49527c5 100644
33--- a/src/designer/src/src.pro
34+++ b/src/designer/src/src.pro
35@@ -1,18 +1,20 @@
36 TEMPLATE = subdirs
37
38-SUBDIRS = \
39- uitools \
40- lib \
41- components \
42- designer
43+!linguistonly {
44+ SUBDIRS = \
45+ lib \
46+ components \
47+ designer
48+}
49+SUBDIRS += uitools
50
51-contains(QT_CONFIG, shared): SUBDIRS += plugins
52+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
53
54 components.depends = lib
55 designer.depends = components
56 plugins.depends = lib
57
58-qtNomakeTools( \
59+!linguistonly:qtNomakeTools( \
60 lib \
61 components \
62 designer \
63diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
64index 3a70580..a977878 100644
65--- a/src/linguist/linguist.pro
66+++ b/src/linguist/linguist.pro
67@@ -3,7 +3,7 @@ SUBDIRS = \
68 lrelease \
69 lupdate \
70 lconvert
71-!no-png:qtHaveModule(widgets): SUBDIRS += linguist
72+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist
73
74 qtNomakeTools( \
75 linguist \
76diff --git a/src/src.pro b/src/src.pro
77index 861d06d..3438f9a 100644
78--- a/src/src.pro
79+++ b/src/src.pro
80@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
81 no-png {
82 message("Some graphics-related tools are unavailable without PNG support")
83 } else {
84- SUBDIRS = assistant \
85+ !linguistonly {
86+ SUBDIRS = assistant \
87 pixeltool \
88- qtestlib \
89- designer
90+ qtestlib
91+ }
92+ SUBDIRS += designer
93 # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
94
95 linguist.depends = designer
96@@ -15,7 +17,7 @@ qtHaveModule(widgets) {
97 }
98
99 SUBDIRS += linguist
100-!android|android_app: SUBDIRS += qtpaths
101+!linguistonly:!android|android_app: SUBDIRS += qtpaths
102
103 mac {
104 SUBDIRS += macdeployqt
105@@ -25,7 +27,7 @@ android {
106 SUBDIRS += androiddeployqt
107 }
108
109-qtHaveModule(dbus): SUBDIRS += qdbus
110+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
111
112 win32|winrt:SUBDIRS += windeployqt
113 winrt:SUBDIRS += winrtrunner qtd3dservice
114@@ -36,4 +38,4 @@ qtNomakeTools( \
115 macdeployqt \
116 )
117
118-!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
119+!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
120diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
121index c3acfe3..b48e711 100644
122--- a/tests/auto/auto.pro
123+++ b/tests/auto/auto.pro
124@@ -1,15 +1,17 @@
125 TEMPLATE=subdirs
126-SUBDIRS=\
127- linguist \
128- host.pro \
129- qhelpcontentmodel \
130- qhelpenginecore \
131- qhelpgenerator \
132- qhelpindexmodel \
133- qhelpprojectdata \
134- cmake \
135- installed_cmake \
136- qtdiag
137+!linguistonly {
138+ SUBDIRS=\
139+ linguist \
140+ host.pro \
141+ qhelpcontentmodel \
142+ qhelpenginecore \
143+ qhelpgenerator \
144+ qhelpindexmodel \
145+ qhelpprojectdata \
146+ cmake \
147+ installed_cmake \
148+ qtdiag
149+}
150
151 installed_cmake.depends = cmake
152
153--
1541.9.1
155
diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
new file mode 100644
index 00000000..1c404717
--- /dev/null
+++ b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -0,0 +1,32 @@
1From 509541ebd648414ee33f3aea3035d1e6382bfa3c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 17 Jan 2014 14:33:19 +0100
4Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get:
10| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link)
11| ...undefined reference to `QCLucenePhraseQuery::getTerms() const'
12
13Upstream-Status: Inappropriate [configuration]
14
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16---
17 src/assistant/help/help.pro | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
21index 168d23d..a9c3b59 100644
22--- a/src/assistant/help/help.pro
23+++ b/src/assistant/help/help.pro
24@@ -59,3 +59,5 @@ HEADERS += qhelpenginecore.h \
25 # access to clucene
26 HEADERS += qhelpsearchindexwriter_clucene_p.h \
27 qhelpsearchindexreader_clucene_p.h
28+
29+LIBS += -lQt5CLucene
30--
311.9.1
32
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
index 200f4277..49a1907d 100644
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ b/recipes-qt/qt5/qttools-native_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
5# v5.2.1 + 13 commits 5
6SRCREV = "80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 200f4277..49a1907d 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
5# v5.2.1 + 13 commits 5
6SRCREV = "80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index b8206658..9fac8b23 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -10,3 +10,9 @@ SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e"
10do_install_append() { 10do_install_append() {
11 ln -sf ${D}${OE_QMAKE_PATH_QT_BINS}/qtwaylandscanner ${D}${bindir}/qtwaylandscanner 11 ln -sf ${D}${OE_QMAKE_PATH_QT_BINS}/qtwaylandscanner ${D}${bindir}/qtwaylandscanner
12} 12}
13
14# older copyright year than what e.g. qtbase is using now
15LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
16 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
17 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
18 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index df7a5623..3f18272a 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -14,3 +14,9 @@ do_install_append() {
14 # do install files created by qtwaylandscanner 14 # do install files created by qtwaylandscanner
15 install ${B}/include/QtCompositor/5.3.0/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.3.0/QtCompositor/private 15 install ${B}/include/QtCompositor/5.3.0/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.3.0/QtCompositor/private
16} 16}
17
18# older copyright year than what e.g. qtbase is using now
19LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
20 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
21 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
22 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 1f5df718..98fdc2f0 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "c9d13139b65818785f218cc96d136d33591ca2f5"
5# v5.2.1 + 1 commits
6SRCREV = "cb8ed9694b850a429a93490beaa6462d9f3b8ea6"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 047b37fd..ec8b4f34 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "0546c8656a3728bf4375da39027e096beba4f111"
5# v5.2.1 + 18 commits
6SRCREV = "a1b801fc98ccda988df41e08dc70fdbd50ecb513"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index d0a2a8cb..954545f7 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "947361a7dc8db093d0b8e1ec5ac953470a180259"
5# v5.2.1 + 1 commits
6SRCREV = "dd7eec92e7a5f4383783cc161f638867572dc208"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 28e45a48..b86a749d 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,6 +1,10 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "release" 4SRCREV = "d25091bb8b52455e415f8147a9100094c489a041"
5# v5.2.1 + 4 commits 5
6SRCREV = "eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db0" 6# older copyright year than what e.g. qtbase is using now
7LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
8 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-02 19:06:14 +0000