summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/qt5-versions.inc4
-rw-r--r--recipes-qt/qt5/qt5-5.1.0.inc22
-rw-r--r--recipes-qt/qt5/qt5.inc1
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch304
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch40
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch36
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch218
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch51
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch30
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch29
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch29
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch70
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch62
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch82
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch44
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch37
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch47
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch35
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch48
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch154
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch49
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch34
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch36
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch35
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch35
-rw-r--r--recipes-qt/qt5/qtbase-native_5.1.0.bb11
-rw-r--r--recipes-qt/qt5/qtbase_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch46
-rw-r--r--recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch41
-rw-r--r--recipes-qt/qt5/qtdeclarative_5.1.0.bb15
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtimageformats_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch32
-rw-r--r--recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch31
-rw-r--r--recipes-qt/qt5/qtjsbackend-native_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtjsbackend_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtmultimedia_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtquick1_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtscript_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtsensors_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtsvg_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtwebkit_5.1.0.bb5
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_5.1.0.bb5
43 files changed, 1767 insertions, 1 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index 01a5a25a..f033a20a 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -1,5 +1,5 @@
1# Select which version you prefer by defining QT5_VERSION and including this file 1# Select which version you prefer by defining QT5_VERSION and including this file
2# possible values now "5.0.2", "5.0.2+git%" 2# possible values now "5.0.2", "5.0.2+git%", "5.1.0%"
3 3
4QT5_VERSION ?= "5.0.2" 4QT5_VERSION ?= "5.0.2"
5 5
@@ -12,7 +12,9 @@ PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}"
12PREFERRED_VERSION_qtimageformats = "${QT5_VERSION}" 12PREFERRED_VERSION_qtimageformats = "${QT5_VERSION}"
13PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}" 13PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}"
14PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}" 14PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}"
15PREFERRED_VERSION_qtsensors = "${QT5_VERSION}"
15PREFERRED_VERSION_qtscript = "${QT5_VERSION}" 16PREFERRED_VERSION_qtscript = "${QT5_VERSION}"
16PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" 17PREFERRED_VERSION_qtsvg = "${QT5_VERSION}"
17PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" 18PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
18PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" 19PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}"
20PREFERRED_VERSION_qtwayland = "${QT5_VERSION}"
diff --git a/recipes-qt/qt5/qt5-5.1.0.inc b/recipes-qt/qt5/qt5-5.1.0.inc
new file mode 100644
index 00000000..e26cc053
--- /dev/null
+++ b/recipes-qt/qt5/qt5-5.1.0.inc
@@ -0,0 +1,22 @@
1# Copyright (C) 2012 O.S. Systems Software LTDA.
2# Copyright (C) 2013 Martin Jansa <martin.jansa@gmail.com>
3
4QT_VERSION ?= "${PV}"
5
6# it's different for RC versions
7QT_VERSION_DIR ?= "5.1"
8
9# less tested then 5.0.2 or git recipes
10DEFAULT_PREFERENCE = "-2"
11
12SRC_URI += " \
13 http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
14"
15
16S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}"
17
18LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
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/qt5.inc b/recipes-qt/qt5/qt5.inc
index 87bf5e8f..80acb73e 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -67,6 +67,7 @@ FILES_${PN}-qmlplugins = " \
67 ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*.qmltypes \ 67 ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*.qmltypes \
68 ${OE_QMAKE_PATH_IMPORTS}/*/*/*/qmldir \ 68 ${OE_QMAKE_PATH_IMPORTS}/*/*/*/qmldir \
69" 69"
70
70FILES_${PN}-tools = " \ 71FILES_${PN}-tools = " \
71 ${OE_QMAKE_PATH_BINS}/* \ 72 ${OE_QMAKE_PATH_BINS}/* \
72" 73"
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch
new file mode 100644
index 00000000..669dffcd
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch
@@ -0,0 +1,304 @@
1From 7244ed3ca9326f3521de8961dbe7f9759f8e8041 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/23] 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* OE_QMAKE_CXX in order to allow compiler version check to succeed
15 which allows WebKit to be enabled.
16
17* Other variables in order to let config.tests to use our -platform
18 settings
19
20* Add setBootstrapEvalVariable to bootstrap qmake with our environment
21 too, this allows us to use -platform linux-oe-g++ also for native
22 recipe
23
24* disable gdb_dwarf_index
25 * qmake is trying to call native gdb and we don't depend on gdb-native
26 (or even provide gdb-native)
27 * fixes errors like this:
28 /bin/sh: gdb: command not found
29 /bin/sh: line 0: test: -gt: unary operator expected
30 which are not fatal, but still misleading in do_configure output
31
32Upstream-Status: Pending
33
34Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
35---
36 configure | 54 ++++++++++++++++---
37 mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
38 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
39 3 files changed, 187 insertions(+), 7 deletions(-)
40 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
42
43diff --git a/configure b/configure
44index d7c9674..45e0586 100755
45--- a/configure
46+++ b/configure
47@@ -284,6 +284,16 @@ getQMakeConf()
48 getSingleQMakeVariable "$1" "$specvals"
49 }
50
51+# OE qmake.conf is reading some variables from shell env
52+# read them from qmake.conf, replace qmake () syntax with shell and eval
53+getQEvalMakeConf()
54+{
55+ VAL=`getQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
56+ EVAL=`eval "echo ${VAL}"`
57+# echo "Running getQEvalMakeConf: var='$1', val='`getQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
58+ eval "echo ${VAL}"
59+}
60+
61 getXQMakeConf()
62 {
63 if [ -z "$xspecvals" ]; then
64@@ -293,6 +303,16 @@ getXQMakeConf()
65 getSingleQMakeVariable "$1" "$xspecvals"
66 }
67
68+# OE qmake.conf is reading some variables from shell env
69+# read them from qmake.conf, replace qmake () syntax with shell and eval
70+getXQEvalMakeConf()
71+{
72+ VAL=`getXQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
73+ EVAL=`eval "echo ${VAL}"`
74+# echo "Running getXQEvalMakeConf: var='$1', val='`getXQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
75+ eval "echo ${VAL}"
76+}
77+
78 compilerSupportsFlag()
79 {
80 cat >conftest.cpp <<EOF
81@@ -809,6 +829,18 @@ fi
82 # initalize variables
83 #-------------------------------------------------------------------------------
84
85+# Export all OE variables for qmake.conf from shell env to QMakeVars
86+OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP"
87+for varname in $OE_VARIABLES; do
88+ qmakevarname="${varname}"
89+ cmd=`echo \
90+'if [ -n "\$OE_QMAKE_'${varname}'" ]; then
91+ QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'"
92+# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2
93+fi'`
94+ eval "$cmd"
95+done
96+
97 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
98 for varname in $SYSTEM_VARIABLES; do
99 qmakevarname="${varname}"
100@@ -2836,7 +2868,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
101 CFG_QGTKSTYLE=no
102 fi
103
104-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
105+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX`
106
107 TEST_COMPILER=$QMAKE_CONF_COMPILER
108
109@@ -2871,7 +2903,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
110 exit 1
111 fi
112 fi
113-TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS`
114+TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS`
115
116 GCC_MACHINE_DUMP=
117 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
118@@ -3909,6 +3941,14 @@ setBootstrapVariable()
119 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
120 }
121
122+# OE qmake.conf is reading some variables from shell env
123+# read them from qmake.conf, replace qmake () syntax with shell and eval
124+setBootstrapEvalVariable()
125+{
126+ getQEvalMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
127+}
128+
129+
130 # build qmake
131 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
132 echo "Creating qmake..."
133@@ -3947,11 +3987,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
134 fi
135
136 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
137- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
138- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
139- setBootstrapVariable QMAKE_CFLAGS
140- setBootstrapVariable QMAKE_CXXFLAGS
141- setBootstrapVariable QMAKE_LFLAGS
142+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM"
143+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM"
144+ setBootstrapEvalVariable QMAKE_CFLAGS
145+ setBootstrapEvalVariable QMAKE_CXXFLAGS
146+ setBootstrapEvalVariable QMAKE_LFLAGS
147
148 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
149 setBootstrapVariable QMAKE_CFLAGS_RELEASE
150diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
151new file mode 100644
152index 0000000..ca26b10
153--- /dev/null
154+++ b/mkspecs/linux-oe-g++/qmake.conf
155@@ -0,0 +1,40 @@
156+#
157+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
158+#
159+
160+MAKEFILE_GENERATOR = UNIX
161+CONFIG += incremental
162+QMAKE_INCREMENTAL_STYLE = sublib
163+
164+include(../common/linux.conf)
165+
166+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
167+QMAKE_AR = $(OE_QMAKE_AR) cqs
168+QMAKE_STRIP = $(OE_QMAKE_STRIP)
169+QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER)
170+
171+include(../common/gcc-base-unix.conf)
172+
173+# *FLAGS from gcc-base.conf
174+QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS)
175+QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS)
176+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
177+
178+include(../common/g++-unix.conf)
179+
180+# tc settings from g++-base.conf
181+QMAKE_COMPILER = $(OE_QMAKE_COMPILER)
182+QMAKE_CC = $(OE_QMAKE_CC)
183+QMAKE_CXX = $(OE_QMAKE_CXX)
184+
185+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
186+
187+QMAKE_LINK = $(OE_QMAKE_LINK)
188+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
189+QMAKE_LINK_C = $(OE_QMAKE_LINK)
190+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
191+
192+# for the SDK
193+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
194+
195+load(qt_config)
196diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
197new file mode 100644
198index 0000000..dd12003
199--- /dev/null
200+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
201@@ -0,0 +1,100 @@
202+/****************************************************************************
203+**
204+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
205+** Contact: http://www.qt-project.org/legal
206+**
207+** This file is part of the qmake spec of the Qt Toolkit.
208+**
209+** $QT_BEGIN_LICENSE:LGPL$
210+** Commercial License Usage
211+** Licensees holding valid commercial Qt licenses may use this file in
212+** accordance with the commercial license agreement provided with the
213+** Software or, alternatively, in accordance with the terms contained in
214+** a written agreement between you and Digia. For licensing terms and
215+** conditions see http://qt.digia.com/licensing. For further information
216+** use the contact form at http://qt.digia.com/contact-us.
217+**
218+** GNU Lesser General Public License Usage
219+** Alternatively, this file may be used under the terms of the GNU Lesser
220+** General Public License version 2.1 as published by the Free Software
221+** Foundation and appearing in the file LICENSE.LGPL included in the
222+** packaging of this file. Please review the following information to
223+** ensure the GNU Lesser General Public License version 2.1 requirements
224+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
225+**
226+** In addition, as a special exception, Digia gives you certain additional
227+** rights. These rights are described in the Digia Qt LGPL Exception
228+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
229+**
230+** GNU General Public License Usage
231+** Alternatively, this file may be used under the terms of the GNU
232+** General Public License version 3.0 as published by the Free Software
233+** Foundation and appearing in the file LICENSE.GPL included in the
234+** packaging of this file. Please review the following information to
235+** ensure the GNU General Public License version 3.0 requirements will be
236+** met: http://www.gnu.org/copyleft/gpl.html.
237+**
238+**
239+** $QT_END_LICENSE$
240+**
241+****************************************************************************/
242+
243+#ifndef QPLATFORMDEFS_H
244+#define QPLATFORMDEFS_H
245+
246+// Get Qt defines/settings
247+
248+#include "qglobal.h"
249+
250+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
251+
252+// 1) need to reset default environment if _BSD_SOURCE is defined
253+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
254+// 3) it seems older glibc need this to include the X/Open stuff
255+#ifndef _GNU_SOURCE
256+# define _GNU_SOURCE
257+#endif
258+
259+#include <unistd.h>
260+
261+
262+// We are hot - unistd.h should have turned on the specific APIs we requested
263+
264+#include <features.h>
265+#include <pthread.h>
266+#include <dirent.h>
267+#include <fcntl.h>
268+#include <grp.h>
269+#include <pwd.h>
270+#include <signal.h>
271+
272+#include <sys/types.h>
273+#include <sys/ioctl.h>
274+#include <sys/ipc.h>
275+#include <sys/time.h>
276+#include <sys/shm.h>
277+#include <sys/socket.h>
278+#include <sys/stat.h>
279+#include <sys/wait.h>
280+#include <netinet/in.h>
281+#ifndef QT_NO_IPV6IFNAME
282+#include <net/if.h>
283+#endif
284+
285+#define QT_USE_XOPEN_LFS_EXTENSIONS
286+#include "../common/posix/qplatformdefs.h"
287+
288+#undef QT_SOCKLEN_T
289+
290+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
291+#define QT_SOCKLEN_T socklen_t
292+#else
293+#define QT_SOCKLEN_T int
294+#endif
295+
296+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
297+#define QT_SNPRINTF ::snprintf
298+#define QT_VSNPRINTF ::vsnprintf
299+#endif
300+
301+#endif // QPLATFORMDEFS_H
302--
3031.8.3.2
304
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch
new file mode 100644
index 00000000..5f37a971
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch
@@ -0,0 +1,40 @@
1From 28cb656a49b80364f4bfc4387849f1e9ac56fbf2 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 27 Nov 2012 12:46:44 -0800
4Subject: [PATCH] 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 | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/src/src.pro b/src/src.pro
17index b4c9602..f30ec1f 100644
18--- a/src/src.pro
19+++ b/src/src.pro
20@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions
22 src_plugins.depends += src_gui src_platformsupport
23 !contains(QT_CONFIG, no-widgets) {
24- SUBDIRS += src_tools_uic src_widgets
25+ SUBDIRS += src_widgets
26 src_plugins.depends += src_widgets
27 contains(QT_CONFIG, opengl(es1|es2)?) {
28 SUBDIRS += src_opengl
29@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
30 }
31 }
32 }
33-SUBDIRS += src_plugins src_tools_qdoc
34+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
35
36 nacl: SUBDIRS -= src_network src_testlib
37
38--
391.8.3.2
40
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
new file mode 100644
index 00000000..c9c663a3
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -0,0 +1,36 @@
1From 6eb6d141309bc5a42218fbc755545ead70a88b55 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 02/23] 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: Pending
12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 src/corelib/global/qlibraryinfo.cpp | 5 ++++-
16 1 file changed, 4 insertions(+), 1 deletion(-)
17
18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
19index 1eaebe5..bda2ffe 100644
20--- a/src/corelib/global/qlibraryinfo.cpp
21+++ b/src/corelib/global/qlibraryinfo.cpp
22@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings()
23
24 QSettings *QLibraryInfoPrivate::findConfiguration()
25 {
26- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
27+ QByteArray config = getenv("QT_CONF_PATH");
28+ QString qtconfig = QFile::decodeName(config);
29+ if(!QFile::exists(qtconfig))
30+ qtconfig = QStringLiteral(":/qt/etc/qt.conf");
31 #ifdef QT_BOOTSTRAPPED
32 if(!QFile::exists(qtconfig))
33 qtconfig = qt_libraryInfoFile();
34--
351.8.3.2
36
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch
new file mode 100644
index 00000000..751275ed
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch
@@ -0,0 +1,218 @@
1From 253db5565b402dfc0b2abbcc813d6ac32eecef96 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 03/23] 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
11Upstream-Status: Pending
12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 configure | 15 ++++++++++++++-
16 mkspecs/features/qt_functions.prf | 5 ++++-
17 mkspecs/features/qt_tool.prf | 2 +-
18 qmake/property.cpp | 1 +
19 qtbase.pro | 12 +++++++++---
20 src/corelib/global/qlibraryinfo.cpp | 3 ++-
21 src/corelib/global/qlibraryinfo.h | 1 +
22 tools/configure/configureapp.cpp | 8 ++++++++
23 8 files changed, 40 insertions(+), 7 deletions(-)
24
25diff --git a/configure b/configure
26index 45e0586..dbe7360 100755
27--- a/configure
28+++ b/configure
29@@ -1038,6 +1038,7 @@ QT_HOST_PREFIX=
30 QT_HOST_BINS=
31 QT_HOST_LIBS=
32 QT_HOST_DATA=
33+QT_EXTERNAL_HOST_BINS=
34
35 #flags for SQL drivers
36 QT_CFLAGS_PSQL=
37@@ -1145,7 +1146,7 @@ while [ "$#" -gt 0 ]; do
38 VAL=no
39 ;;
40 #Qt style options that pass an argument
41- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-hostlibdir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version)
42+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-hostlibdir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version|-external-hostbindir)
43 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
44 shift
45 VAL="$1"
46@@ -1333,6 +1334,9 @@ while [ "$#" -gt 0 ]; do
47 hostlibdir)
48 QT_HOST_LIBS="$VAL"
49 ;;
50+ external-hostbindir)
51+ QT_EXTERNAL_HOST_BINS="$VAL"
52+ ;;
53 pkg-config)
54 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
55 CFG_PKGCONFIG="$VAL"
56@@ -3190,6 +3194,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
57 QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
58 fi
59
60+# default is empty, don't call makeabs if it is empty
61+if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
62+ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
63+fi
64+
65 #-------------------------------------------------------------------------------
66 # help - interactive parts of the script _after_ this section please
67 #-------------------------------------------------------------------------------
68@@ -3358,6 +3367,9 @@ Installation options:
69 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
70 (default HOSTPREFIX)
71
72+ -external-hostbindir <dir> Use external host executables instead of building them
73+ (not used by defaut)
74+
75 Configure options:
76
77 The defaults (*) are usually acceptable. A plus (+) denotes a default value
78@@ -3873,6 +3885,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
79 "qt_hbinpath=$QT_HOST_BINS",
80 "qt_hlibpath=$QT_HOST_LIBS",
81 "qt_hdatpath=$QT_HOST_DATA",
82+ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS",
83 "qt_targspec=$shortxspec",
84 "qt_hostspec=$shortspec",
85 #endif
86diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
87index bbbb5d3..d581367 100644
88--- a/mkspecs/features/qt_functions.prf
89+++ b/mkspecs/features/qt_functions.prf
90@@ -193,7 +193,10 @@ defineTest(qtAddRpathLink) {
91 defineTest(qtPrepareTool) {
92 $$1 = $$eval(QT_TOOL.$${2}.binary)
93 isEmpty($$1) {
94- $$1 = $$[QT_HOST_BINS]/$$2
95+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
96+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
97+ $$1 = $$[QT_HOST_BINS]/$$2
98+ }
99 exists($$eval($$1).pl) {
100 $$1 = perl -w $$eval($$1).pl
101 } else: contains(QMAKE_HOST.os, Windows) {
102diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
103index 9a6b963..83ef3a0 100644
104--- a/mkspecs/features/qt_tool.prf
105+++ b/mkspecs/features/qt_tool.prf
106@@ -16,7 +16,7 @@ CONFIG += console
107 # If we are doing a prefix build, create a "module" pri which enables
108 # qtPrepareTool() to work with the non-installed build.
109 # Non-bootstrapped tools always need this because of the environment setup.
110-!build_pass:if(!host_build|!force_bootstrap|force_independent) {
111+!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
112 isEmpty(MODULE):MODULE = $$TARGET
113
114 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
115diff --git a/qmake/property.cpp b/qmake/property.cpp
116index 4685440..93eb1d4 100644
117--- a/qmake/property.cpp
118+++ b/qmake/property.cpp
119@@ -75,6 +75,7 @@ static const struct {
120 { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
121 { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true },
122 { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true },
123+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true },
124 { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true },
125 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
126 };
127diff --git a/qtbase.pro b/qtbase.pro
128index 6ab032e..38872b6 100644
129--- a/qtbase.pro
130+++ b/qtbase.pro
131@@ -68,16 +68,22 @@ CONFIG -= qt
132
133 #qmake
134 qmake.path = $$[QT_HOST_BINS]
135+qmake.files = $$OUT_PWD/bin/qmake
136+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
137+ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/qmake
138+}
139 equals(QMAKE_HOST.os, Windows) {
140- qmake.files = $$OUT_PWD/bin/qmake.exe
141-} else {
142- qmake.files = $$OUT_PWD/bin/qmake
143+ qmake.files = $${qmake.files}.exe
144 }
145 INSTALLS += qmake
146
147 #syncqt
148 syncqt.path = $$[QT_HOST_BINS]
149 syncqt.files = $$PWD/bin/syncqt.pl
150+syncqt.files = $$PWD/bin/syncqt.pl
151+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
152+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl
153+}
154 INSTALLS += syncqt
155
156 # If we are doing a prefix build, create a "module" pri which enables
157diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
158index bda2ffe..530aea9 100644
159--- a/src/corelib/global/qlibraryinfo.cpp
160+++ b/src/corelib/global/qlibraryinfo.cpp
161@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
162 */
163
164 static const struct {
165- char key[19], value[13];
166+ char key[21], value[13];
167 } qtConfEntries[] = {
168 { "Prefix", "." },
169 { "Documentation", "doc" }, // should be ${Data}/doc
170@@ -296,6 +296,7 @@ static const struct {
171 { "HostBinaries", "bin" },
172 { "HostLibraries", "lib" },
173 { "HostData", "." },
174+ { "ExternalHostBinaries", "" },
175 { "TargetSpec", "" },
176 { "HostSpec", "" },
177 #endif
178diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
179index b275e01..0e6baed 100644
180--- a/src/corelib/global/qlibraryinfo.h
181+++ b/src/corelib/global/qlibraryinfo.h
182@@ -84,6 +84,7 @@ public:
183 HostBinariesPath,
184 HostLibrariesPath,
185 HostDataPath,
186+ ExternalHostBinariesPath,
187 TargetSpecPath,
188 HostSpecPath,
189 LastHostPath = HostSpecPath,
190diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
191index f92fad1..8f0bd0e 100644
192--- a/tools/configure/configureapp.cpp
193+++ b/tools/configure/configureapp.cpp
194@@ -1161,6 +1161,13 @@ void Configure::parseCmdLine()
195 dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i);
196 }
197
198+ else if (configCmdLine.at(i) == "-external-hostbindir") {
199+ ++i;
200+ if (i == argCount)
201+ break;
202+ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i);
203+ }
204+
205 else if (configCmdLine.at(i) == "-make-tool") {
206 ++i;
207 if (i == argCount)
208@@ -3752,6 +3759,7 @@ void Configure::generateQConfigCpp()
209 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
210 << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
211 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
212+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl
213 << " \"qt_targspec=" << targSpec << "\"," << endl
214 << " \"qt_hostspec=" << hostSpec << "\"," << endl
215 << "#endif" << endl
216--
2171.8.3.2
218
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch
new file mode 100644
index 00000000..4fe10871
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch
@@ -0,0 +1,51 @@
1From ad252e21f737536027aebbf63217188a80d108ba Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 17 Apr 2013 18:06:25 +0200
4Subject: [PATCH 04/23] qt_functions: temporary remove isEmpty check
5
6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
7* isEmpty works correctly only with qmake variables (e.g. $$FOO -
8 isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 mkspecs/features/qt_functions.prf | 6 +++++-
15 mkspecs/features/qt_tool.prf | 3 +--
16 2 files changed, 6 insertions(+), 3 deletions(-)
17
18diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
19index d581367..2bc6533 100644
20--- a/mkspecs/features/qt_functions.prf
21+++ b/mkspecs/features/qt_functions.prf
22@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) {
23 $$1 = $$eval(QT_TOOL.$${2}.binary)
24 isEmpty($$1) {
25 $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
26- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
27+ # for some reason isEmpty does not work here, FIXME before submitting upstream
28+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
29+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
30+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
31+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
32 $$1 = $$[QT_HOST_BINS]/$$2
33 }
34 exists($$eval($$1).pl) {
35diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
36index 83ef3a0..21c9eb7 100644
37--- a/mkspecs/features/qt_tool.prf
38+++ b/mkspecs/features/qt_tool.prf
39@@ -15,8 +15,7 @@ CONFIG += console
40
41 # If we are doing a prefix build, create a "module" pri which enables
42 # qtPrepareTool() to work with the non-installed build.
43-# Non-bootstrapped tools always need this because of the environment setup.
44-!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
45+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
46 isEmpty(MODULE):MODULE = $$TARGET
47
48 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
49--
501.8.3.2
51
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch
new file mode 100644
index 00000000..69b14358
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch
@@ -0,0 +1,30 @@
1From bd7521ebc01feedde14e3e5e037ebd66b994db06 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/23] qmake is already built in qtbase-native
5
6Ported from OE by: Yu Ke <ke.yu@intel.com>
7Upstream-Status: Inappropriate [configuration]
8
9Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure b/configure
16index dbe7360..f8f0e9a 100755
17--- a/configure
18+++ b/configure
19@@ -3963,7 +3963,7 @@ setBootstrapEvalVariable()
20
21
22 # build qmake
23-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
24+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
25 echo "Creating qmake..."
26
27 mkdir -p "$outpath/qmake" || exit
28--
291.8.3.2
30
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch
new file mode 100644
index 00000000..363a8ee9
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch
@@ -0,0 +1,29 @@
1From 00997b0cf46d6b6c362c48ee31f886c553a3fb4f Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Mon, 29 Oct 2012 20:26:36 -0700
4Subject: [PATCH 06/23] Allow building a separate qmake for the target
5
6Upstream-Status: Inappropriate [config]
7
8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 qmake/qmake.pro | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/qmake/qmake.pro b/qmake/qmake.pro
16index 0d92ac2..9be0e9b 100644
17--- a/qmake/qmake.pro
18+++ b/qmake/qmake.pro
19@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic
20 DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \
21 PROEVALUATOR_FULL PROEVALUATOR_DEBUG
22 DESTDIR = ../bin/
23+TARGET = qmake
24
25 OBJECTS_DIR = .
26 MOC_DIR = .
27--
281.8.3.2
29
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
new file mode 100644
index 00000000..97b1269c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -0,0 +1,29 @@
1From 662115f5e837fc397533810ca659af0f66749ce4 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 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT
6
7Upstream-Status: Pending
8---
9 tools/configure/configureapp.cpp | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
13index 8f0bd0e..f7ff15c 100644
14--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp
16@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri()
17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
19 // FIXME: add detection
20- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
21- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
22+ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
23+ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
24 }
25 if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
26 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
27--
281.8.3.2
29
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch
new file mode 100644
index 00000000..2de71037
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch
@@ -0,0 +1,70 @@
1From 1db1ad1ef3c57f531bf67be33a4cc43528864543 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement
5
6* in situation like this:
7 QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
8 QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
9 QT_INSTALL_LIBS/raw:/usr/lib
10 QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
11
12 I don't want the replacement like this:
13 sed
14 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
15 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
16 "../../lib/pkgconfig/Qt5Core.pc"
17 >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
18 because that way I'll end with -L/usr/lib in .pc file which is
19 cross-compile unfriendly, keeping ${libdir}/${includedir} works better
20 in my case
21
22Upstream-Status: Pending
23
24Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
25---
26 mkspecs/features/qt_module.prf | 20 ++++++++++++++++----
27 1 file changed, 16 insertions(+), 4 deletions(-)
28
29diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
30index 53a5499..9dfc1dd 100644
31--- a/mkspecs/features/qt_module.prf
32+++ b/mkspecs/features/qt_module.prf
33@@ -140,18 +140,30 @@ unix|win32-g++* {
34 rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
35 else: \
36 rplbase = $$MODULE_BASE_OUTDIR
37+ pkgconfig_include_replace.match = $$rplbase/include
38+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
39+ pkgconfig_lib_replace.match = $$rplbase/lib
40+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
41 include_replace.match = $$rplbase/include
42 include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
43 lib_replace.match = $$rplbase/lib
44- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
45- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
46+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
47+ lafile_replace.match = $$rplbase
48+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
49+
50+ !isEmpty(SYSROOT): \
51+ rplbase = $$[SYSROOT] \
52+ lafile_replace.match = $$rplbase \
53+ lafile_replace.replace = "=" \
54+
55+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
56 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
57 }
58
59 unix {
60 CONFIG += create_libtool explicitlib
61- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR
62- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
63+ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
64+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace
65 }
66
67 unix|win32-g++* {
68--
691.8.3.2
70
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch
new file mode 100644
index 00000000..f9e6c64e
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch
@@ -0,0 +1,62 @@
1From 036a2be171a0bf6fea5eaa7383e19f2559a37dce Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 28 Apr 2013 12:56:55 +0200
4Subject: [PATCH 09/23] qt_module: Fix paths in .prl files
5
6* qmake does not prefix them with QT_SYSROOT when using them
7 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
8 variable, which is unsafe for cross-compilation
9* writting QT_SYSROOT in .prl files is dangerous for sstate when
10 builds are in different directories, so we need
11 SSTATE_SCAN_FILES += "*.pri *.prl"
12 to make them relocateble
13
14Upstream-Status: Pending
15
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 mkspecs/features/qt_module.prf | 28 +++++++++++++++++-----------
19 1 file changed, 17 insertions(+), 11 deletions(-)
20
21diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
22index 9dfc1dd..5cedb8f 100644
23--- a/mkspecs/features/qt_module.prf
24+++ b/mkspecs/features/qt_module.prf
25@@ -144,17 +144,23 @@ unix|win32-g++* {
26 pkgconfig_include_replace.replace = "\$$\\{includedir}"
27 pkgconfig_lib_replace.match = $$rplbase/lib
28 pkgconfig_lib_replace.replace = "\$$\\{libdir}"
29- include_replace.match = $$rplbase/include
30- include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
31- lib_replace.match = $$rplbase/lib
32- lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
33- lafile_replace.match = $$rplbase
34- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
35-
36- !isEmpty(SYSROOT): \
37- rplbase = $$[SYSROOT] \
38- lafile_replace.match = $$rplbase \
39- lafile_replace.replace = "=" \
40+ !exists($$[QT_SYSROOT]) {
41+ include_replace.match = $$rplbase/include
42+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
43+ lib_replace.match = $$rplbase/lib
44+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
45+ lafile_replace.match = $$rplbase
46+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]"
47+ } else {
48+ # include_replace and lib_replace are duplicate, but we don't want to
49+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional
50+ include_replace.match = $$rplbase
51+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
52+ lib_replace.match = $$rplbase
53+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
54+ lafile_replace.match = $$rplbase
55+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
56+ }
57
58 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
59 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
60--
611.8.3.2
62
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch
new file mode 100644
index 00000000..bdbb52a1
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch
@@ -0,0 +1,82 @@
1From c441038a17c1173c8abafd451c4083b2eccc54ab Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 5 May 2013 11:18:34 +0200
4Subject: [PATCH 10/23] wayland-scanner: disable silent rules
5
6* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
7
8Upstream-Status: Pending
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 mkspecs/features/wayland-scanner.prf | 14 +++++++-------
13 1 file changed, 7 insertions(+), 7 deletions(-)
14
15diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
16index 2ec064f..847d0f7 100644
17--- a/mkspecs/features/wayland-scanner.prf
18+++ b/mkspecs/features/wayland-scanner.prf
19@@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES
20 wayland-server-header.variable_out = HEADERS
21 wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
22 wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
23-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
24+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
25 QMAKE_EXTRA_COMPILERS += wayland-server-header
26
27 wayland-client-header.name = wayland ${QMAKE_FILE_BASE}
28@@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES
29 wayland-client-header.variable_out = HEADERS
30 wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
31 wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
32-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
33+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
34 QMAKE_EXTRA_COMPILERS += wayland-client-header
35
36 wayland-code.name = wayland ${QMAKE_FILE_BASE}
37@@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES
38 wayland-code.variable_out = SOURCES
39 wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
40 wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
41-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
42+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
43 QMAKE_EXTRA_COMPILERS += wayland-code
44
45 qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner)
46@@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS
47 qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
48 qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
49 qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
50-silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands
51+#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands
52 QMAKE_EXTRA_COMPILERS += qtwayland-client-header
53
54 qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE}
55@@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES
56 qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
57 qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp
58 qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
59-silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands
60+#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands
61 QMAKE_EXTRA_COMPILERS += qtwayland-client-code
62
63 qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE}
64@@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS
65 qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
66 qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
67 qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
68-silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands
69+#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands
70 QMAKE_EXTRA_COMPILERS += qtwayland-server-header
71
72 qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE}
73@@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES
74 qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
75 qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp
76 qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
77-silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands
78+#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands
79 QMAKE_EXTRA_COMPILERS += qtwayland-server-code
80--
811.8.3.2
82
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
new file mode 100644
index 00000000..7c1e4459
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
@@ -0,0 +1,44 @@
1From 7a24e90118a0d81d76b68d3bd0dafcad0966e49e Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 8 May 2013 23:54:35 +0200
4Subject: [PATCH 11/23] configure: don't export SYSTEM_VARIABLES to .qmake.vars
5
6* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
7 causing issues as we need g++ to be used as linker
8
9Upstream-Status: Pending
10
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 configure | 15 +--------------
14 1 file changed, 1 insertion(+), 14 deletions(-)
15
16diff --git a/configure b/configure
17index f8f0e9a..3c80d5f 100755
18--- a/configure
19+++ b/configure
20@@ -842,20 +842,7 @@ fi'`
21 done
22
23 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
24-for varname in $SYSTEM_VARIABLES; do
25- qmakevarname="${varname}"
26- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
27- if [ "${varname}" = "LDFLAGS" ]; then
28- qmakevarname="LFLAGS"
29- elif [ "${varname}" = "LD" ]; then
30- qmakevarname="LINK"
31- fi
32- cmd=`echo \
33-'if [ -n "\$'${varname}'" ]; then
34- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'"
35-fi'`
36- eval "$cmd"
37-done
38+
39 # Use CC/CXX to run config.tests
40 mkdir -p "$outpath/config.tests"
41 rm -f "$outpath/config.tests/.qmake.cache"
42--
431.8.3.2
44
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
new file mode 100644
index 00000000..66df3688
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
@@ -0,0 +1,37 @@
1From b115685d8c684181a0af79e44a1d170a5a8bfd05 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 9 May 2013 10:06:50 +0200
4Subject: [PATCH 12/23] configure.prf: Allow to add extra arguments to make
5
6* sometimes we would like to add -e or define some variable and respect it from both
7 Makefiles used in configure tests and also Makefiles to build the application
8
9Upstream-Status: Pending
10
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 mkspecs/features/configure.prf | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
17index b4569df..d189e50 100644
18--- a/mkspecs/features/configure.prf
19+++ b/mkspecs/features/configure.prf
20@@ -57,12 +57,12 @@ defineTest(qtCompileTest) {
21 qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
22
23 # Clean up after previous run
24- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
25+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean")
26
27 mkpath($$test_out_dir)|error("Aborting.")
28
29 qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") {
30- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") {
31+ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") {
32 log("yes$$escape_expand(\\n)")
33 msg = "test $$1 succeeded"
34 write_file($$QMAKE_CONFIG_LOG, msg, append)
35--
361.8.3.2
37
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch
new file mode 100644
index 00000000..0a50ee0d
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch
@@ -0,0 +1,47 @@
1From 7455bfff17483c19d7eef3ad81a95f6996ff0ce8 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 8 Jan 2013 15:58:29 -0800
4Subject: [PATCH 13/23] Disable mkv8snapshot
5
6It seems to generate code that throws SIGILL, so disabling it
7
8Program received signal SIGILL, Illegal instruction.
90x26312c60 in ?? ()
10(gdb) bt
11 function=..., receiver=..., argc=1978934572, args=0x7efff254,
12 has_pending_exception=0x7efff277, qml=...)
13 at ../3rdparty/v8/src/execution.cc:125
14 argc=1, argv=0x7efff254, pending_exception=0x7efff277,
15 convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194
16 receiver=<optimized out>, argc=<optimized out>, argv=<optimized out>,
17 pending_exception=0x7efff277, convert_receiver=false)
18 at ../3rdparty/v8/src/execution.cc:161
19 data=<optimized out>, exc=0x7efff277)
20 at ../3rdparty/v8/src/execution.cc:734
21 at ../3rdparty/v8/src/api.cc:4742
22 at qml/v8/qv8contextwrapper.cpp:155
23 ownership=<optimized out>) at qml/v8/qv8engine.cpp:155
24 parent=<optimized out>) at qml/v8/qjsengine.cpp:192
25
26Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
27Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
28---
29 configure | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-)
31
32diff --git a/configure b/configure
33index 3c80d5f..50dbebf 100755
34--- a/configure
35+++ b/configure
36@@ -902,7 +902,7 @@ CFG_SKIP_MODULES=""
37 CFG_COMPILE_EXAMPLES=auto
38 CFG_RELEASE_QMAKE=no
39 CFG_AUDIO_BACKEND=auto
40-CFG_V8SNAPSHOT=auto
41+CFG_V8SNAPSHOT=no
42 CFG_QML_DEBUG=yes
43 CFG_JAVASCRIPTCORE_JIT=auto
44 CFG_PKGCONFIG=auto
45--
461.8.3.2
47
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch
new file mode 100644
index 00000000..38b1e659
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch
@@ -0,0 +1,35 @@
1From 6da394a759ada8c3dcc6649dbbdf89918d675ae7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Mon, 27 May 2013 18:32:37 +0200
4Subject: [PATCH 14/23] enables tslib device to be read from env variable
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9from :
10https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
11
12Signed-off-by: Eric Bénard <eric@eukrea.com>
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 src/plugins/generic/tslib/qtslib.cpp | 4 +++-
16 1 file changed, 3 insertions(+), 1 deletion(-)
17
18diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp
19index 6986fd5..2ed4a69 100644
20--- a/src/plugins/generic/tslib/qtslib.cpp
21+++ b/src/plugins/generic/tslib/qtslib.cpp
22@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
23 qDebug() << "QTsLibMouseHandler" << key << specification;
24 setObjectName(QLatin1String("TSLib Mouse Handler"));
25
26- QByteArray device = "/dev/input/event1";
27+ QByteArray device = qgetenv("TSLIB_TSDEVICE");
28+ if(device.isEmpty())
29+ device = "/dev/input/event1";
30 if (specification.startsWith("/dev/"))
31 device = specification.toLocal8Bit();
32
33--
341.8.3.2
35
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch
new file mode 100644
index 00000000..068467a6
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch
@@ -0,0 +1,48 @@
1From 94a5ed9c22ed927123df3007d426de5d19e4f692 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sat, 25 May 2013 17:34:32 +0200
4Subject: [PATCH 15/23] qtbase: allow build of examples
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9this revert the following commit :
10
11commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61
12Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
13Date: Fri Dec 21 19:36:12 2012 +0100
14
15 do not actually build examples in production builds
16
17 -developer-build enables an actual build of examples, based on the
18 assumption that developers want to test it (it can be still disabled
19 with -nomake examples). regular users otoh want only the examples
20 sources installed.
21
22 Change-Id: Ifc6a108099929175a3960480802b271a758fdd38
23 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
24
25Signed-off-by: Eric Bénard <eric@eukrea.com>
26---
27 mkspecs/features/qt_example_installs.prf | 7 -------
28 1 file changed, 7 deletions(-)
29
30diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
31index 2db752c..ca1b0c7 100644
32--- a/mkspecs/features/qt_example_installs.prf
33+++ b/mkspecs/features/qt_example_installs.prf
34@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
35 allfiles -= doc
36 !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
37 }
38-
39- !equals(TEMPLATE, subdirs):!compile_examples {
40- TEMPLATE = aux
41- CONFIG -= have_target qt staticlib dll
42- SOURCES =
43- INSTALLS -= target
44- }
45 }
46--
471.8.3.2
48
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch
new file mode 100644
index 00000000..2069fffb
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch
@@ -0,0 +1,154 @@
1From 41a9c47ca820502d98039273f7465605464cdf9c Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Thu, 16 May 2013 09:52:07 +0300
4Subject: [PATCH 18/23] QOpenGLPaintDevice sub-area support
5
6Allows creating QOpenGLPaintDevice targetting sub-area
7of binded framebuffer.
8
9Upstream-Status: Pending
10
11Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80
12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++
16 src/gui/opengl/qopenglpaintdevice.h | 2 ++
17 src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++---
18 src/gui/opengl/qopenglpaintengine_p.h | 1 +
19 src/gui/opengl/qopengltextureglyphcache.cpp | 2 +-
20 5 files changed, 23 insertions(+), 4 deletions(-)
21
22diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
23index f0e7e49..fe9a30c 100644
24--- a/src/gui/opengl/qopenglpaintdevice.cpp
25+++ b/src/gui/opengl/qopenglpaintdevice.cpp
26@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate
27 public:
28 QOpenGLPaintDevicePrivate(const QSize &size);
29
30+ QPoint offset;
31 QSize size;
32 QOpenGLContext *ctx;
33
34@@ -159,6 +160,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height)
35 {
36 }
37
38+QOpenGLPaintDevice::QOpenGLPaintDevice(int x, int y, int width, int height)
39+ : d_ptr(new QOpenGLPaintDevicePrivate(QSize(width, height)))
40+{
41+ d_ptr->offset = QPoint(x,y);
42+}
43+
44 /*!
45 Destroys the QOpenGLPaintDevice.
46 */
47@@ -228,6 +235,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const
48 return d_ptr->ctx;
49 }
50
51+QPoint QOpenGLPaintDevice::offset() const
52+{
53+ return d_ptr->offset;
54+}
55+
56 /*!
57 Returns the pixel size of the paint device.
58
59diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
60index c05571c..01eb1bc 100644
61--- a/src/gui/opengl/qopenglpaintdevice.h
62+++ b/src/gui/opengl/qopenglpaintdevice.h
63@@ -62,12 +62,14 @@ public:
64 QOpenGLPaintDevice();
65 explicit QOpenGLPaintDevice(const QSize &size);
66 QOpenGLPaintDevice(int width, int height);
67+ QOpenGLPaintDevice(int x, int y, int width, int height);
68 virtual ~QOpenGLPaintDevice();
69
70 int devType() const { return QInternal::OpenGL; }
71 QPaintEngine *paintEngine() const;
72
73 QOpenGLContext *context() const;
74+ QPoint offset() const;
75 QSize size() const;
76 void setSize(const QSize &size);
77 void setDevicePixelRatio(qreal devicePixelRatio);
78diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
79index 0782e42..52afc60 100644
80--- a/src/gui/opengl/qopenglpaintengine.cpp
81+++ b/src/gui/opengl/qopenglpaintengine.cpp
82@@ -1978,7 +1978,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
83 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
84 d->vertexAttributeArraysEnabledState[i] = false;
85
86+ const QPoint offset = d->device->offset();
87 const QSize sz = d->device->size();
88+ d->x = offset.x();
89+ d->y = offset.y();
90 d->width = sz.width();
91 d->height = sz.height();
92 d->mode = BrushDrawingMode;
93@@ -2066,7 +2069,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
94 d->device->ensureActiveTarget();
95
96 d->transferMode(BrushDrawingMode);
97- glViewport(0, 0, d->width, d->height);
98+ glViewport(d->x, d->y, d->width, d->height);
99 d->needsSync = false;
100 d->lastMaskTextureUsed = 0;
101 d->shaderManager->setDirty();
102@@ -2109,6 +2112,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
103 if (bounds == QRect(0, 0, width, height)) {
104 glDisable(GL_SCISSOR_TEST);
105 } else {
106+ bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height());
107 glEnable(GL_SCISSOR_TEST);
108 setScissor(bounds);
109 }
110@@ -2117,14 +2121,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
111
112 void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
113 {
114- const int left = rect.left();
115+ const int left = rect.left() + x;
116 const int width = rect.width();
117 int bottom = height - (rect.top() + rect.height());
118 if (device->paintFlipped()) {
119 bottom = rect.top();
120 }
121+ bottom += y;
122 const int height = rect.height();
123-
124 glScissor(left, bottom, width, height);
125 }
126
127diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
128index d51f0e5..0d4b38d 100644
129--- a/src/gui/opengl/qopenglpaintengine_p.h
130+++ b/src/gui/opengl/qopenglpaintengine_p.h
131@@ -264,6 +264,7 @@ public:
132 QOpenGL2PaintEngineEx* q;
133 QOpenGLEngineShaderManager* shaderManager;
134 QOpenGLPaintDevice* device;
135+ int x, y;
136 int width, height;
137 QOpenGLContext *ctx;
138 EngineMode mode;
139diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
140index 83f4075..ec29900 100644
141--- a/src/gui/opengl/qopengltextureglyphcache.cpp
142+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
143@@ -268,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
144 funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo);
145
146 if (pex != 0) {
147- glViewport(0, 0, pex->width, pex->height);
148+ glViewport(pex->x, pex->y, pex->width, pex->height);
149 pex->updateClipScissorTest();
150 } else {
151 m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
152--
1531.8.3.2
154
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch
new file mode 100644
index 00000000..c3a9dd54
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch
@@ -0,0 +1,49 @@
1From 7c4453b5203e908f0c851c2a34231d81eb2f73c2 Mon Sep 17 00:00:00 2001
2From: Valery Volgutov <valery.volgutov@lge.com>
3Date: Tue, 21 May 2013 12:02:19 -0700
4Subject: [PATCH 19/23] Fix FBO restoring in QOpenGLTextureGlyphCache
5
6QOpenGLTextureGlyphCache::restoreTextureData restores FBO which
7was binded before restoreTextureData call. More specifically,
8it restores QOpenGLContextPrivate's current_fbo member. This works
9if FBO was binded by QOpenGLFramebufferObject but not if FBO was
10binded using glBindFramebufferObject and rendering done via
11QOpenGLPaintDevice.
12
13This patch fixes it by querying current FBO using
14GL_FRAMEBUFFER_BINDING query and restoring it.
15
16Upstream-Status: Backport
17https://codereview.qt-project.org/#change,56608
18
19Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20---
21 src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++-
22 1 file changed, 4 insertions(+), 1 deletion(-)
23
24diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
25index ec29900..9bda1db 100644
26--- a/src/gui/opengl/qopengltextureglyphcache.cpp
27+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
28@@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
29 return;
30 }
31
32+ GLuint saveFbo;
33+ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo);
34+
35 int oldWidth = m_textureResource->m_width;
36 int oldHeight = m_textureResource->m_height;
37
38@@ -265,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
39 glDeleteTextures(1, &tmp_texture);
40 glDeleteTextures(1, &oldTexture);
41
42- funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo);
43+ funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo);
44
45 if (pex != 0) {
46 glViewport(pex->x, pex->y, pex->width, pex->height);
47--
481.8.3.2
49
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch
new file mode 100644
index 00000000..e081e69a
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch
@@ -0,0 +1,34 @@
1From fb16e96ffef959e45c9cbcbef4cc4f51065f2e47 Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Mon, 27 May 2013 15:25:25 -0700
4Subject: [PATCH 20/23] Use BGRA extension in bindTexture
5
6Upstream-Status: Pending
7
8Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 src/gui/opengl/qopengltexturecache.cpp | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
14
15diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp
16index 94b8288..5c8aa3c 100644
17--- a/src/gui/opengl/qopengltexturecache.cpp
18+++ b/src/gui/opengl/qopengltexturecache.cpp
19@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con
20
21 QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
22
23- // Performance could be improved by skipping qgl_byteSwapImage().
24- if (m_useByteSwapImage)
25- qgl_byteSwapImage(tx);
26-
27- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
28+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
29
30 int cost = tx.width() * tx.height() * 4 / 1024;
31 m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost);
32--
331.8.3.2
34
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch
new file mode 100644
index 00000000..797f258b
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch
@@ -0,0 +1,36 @@
1From 9f79c8047289b9c5bff025a46757bfd5f9bfec4b Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 28 Feb 2012 15:10:24 +0000
4Subject: [PATCH 21/23] configure: make pulseaudio a configurable option
5
6Allows disabling pulseaudio support at configure time.
7
8Upstream-Status: Pending
9
10Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 configure | 7 +++++++
14 1 file changed, 7 insertions(+)
15
16diff --git a/configure b/configure
17index 50dbebf..3b511d4 100755
18--- a/configure
19+++ b/configure
20@@ -1980,6 +1980,13 @@ while [ "$#" -gt 0 ]; do
21 UNKNOWN_OPT=yes
22 fi
23 ;;
24+ pulseaudio)
25+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
26+ CFG_PULSEAUDIO="$VAL"
27+ else
28+ UNKNOWN_OPT=yes
29+ fi
30+ ;;
31 gtkstyle)
32 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
33 CFG_QGTKSTYLE="$VAL"
34--
351.8.3.2
36
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch
new file mode 100644
index 00000000..5fe40805
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch
@@ -0,0 +1,35 @@
1From a51b5c64a33a0c8b411aa4317356c7dfcb99e452 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 19 Jul 2013 23:21:28 +0200
4Subject: [PATCH 22/23] configure: make alsa a configurable option
5
6Allows disabling alsa support at configure time.
7
8Upstream-Status: Pending
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure | 7 +++++++
13 1 file changed, 7 insertions(+)
14
15diff --git a/configure b/configure
16index 3b511d4..2a0be04 100755
17--- a/configure
18+++ b/configure
19@@ -1987,6 +1987,13 @@ while [ "$#" -gt 0 ]; do
20 UNKNOWN_OPT=yes
21 fi
22 ;;
23+ alsa)
24+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
25+ CFG_ALSA="$VAL"
26+ else
27+ UNKNOWN_OPT=yes
28+ fi
29+ ;;
30 gtkstyle)
31 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
32 CFG_QGTKSTYLE="$VAL"
33--
341.8.3.2
35
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch
new file mode 100644
index 00000000..d8ad4b82
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch
@@ -0,0 +1,35 @@
1From eef64dc5f4d998518c314a765bc0a9db7f6fdf9b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 20 Jul 2013 10:56:37 +0200
4Subject: [PATCH 23/23] configure: make freetype a configurable option
5
6Allows disabling freetype support at configure time.
7
8Upstream-Status: Pending
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure | 7 +++++++
13 1 file changed, 7 insertions(+)
14
15diff --git a/configure b/configure
16index 2a0be04..64fbaeb 100755
17--- a/configure
18+++ b/configure
19@@ -1994,6 +1994,13 @@ while [ "$#" -gt 0 ]; do
20 UNKNOWN_OPT=yes
21 fi
22 ;;
23+ freetype)
24+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
25+ CFG_LIBFREETYPE="$VAL"
26+ else
27+ UNKNOWN_OPT=yes
28+ fi
29+ ;;
30 gtkstyle)
31 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
32 CFG_QGTKSTYLE="$VAL"
33--
341.8.3.2
35
diff --git a/recipes-qt/qt5/qtbase-native_5.1.0.bb b/recipes-qt/qt5/qtbase-native_5.1.0.bb
new file mode 100644
index 00000000..563e000e
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-native_5.1.0.bb
@@ -0,0 +1,11 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4do_install_append() {
5 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
6 # e.g. qt3d, qtjsondb, qtwayland
7 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
8}
9
10SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0"
11SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a"
diff --git a/recipes-qt/qt5/qtbase_5.1.0.bb b/recipes-qt/qt5/qtbase_5.1.0.bb
new file mode 100644
index 00000000..b5554641
--- /dev/null
+++ b/recipes-qt/qt5/qtbase_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0"
5SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a"
diff --git a/recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch
new file mode 100644
index 00000000..7a68dd53
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch
@@ -0,0 +1,46 @@
1From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH 1/3] qmltestexample: fix link
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get :
10ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found
11
12Upstream-Status: Inappropriate
13
14Signed-off-by: Eric Bénard <eric@eukrea.com>
15---
16 examples/qmltest/qmltest/qmltest.pro | 2 +-
17 tools/qmltestrunner/qmltestrunner.pro | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
21index b5893c5..1b00e6c 100644
22--- a/examples/qmltest/qmltest/qmltest.pro
23+++ b/examples/qmltest/qmltest/qmltest.pro
24@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml
25 # This code exists solely for the purpose of building this example
26 # inside the examples/ hierarchy.
27
28-QT += qml qmltest
29+QT += qml qmltest quick
30
31 macx: CONFIG -= app_bundle
32
33diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
34index 5184c1f..668cf17 100644
35--- a/tools/qmltestrunner/qmltestrunner.pro
36+++ b/tools/qmltestrunner/qmltestrunner.pro
37@@ -1,5 +1,5 @@
38 SOURCES += main.cpp
39
40-QT += qml qmltest
41+QT += qml qmltest quick
42
43 load(qt_tool)
44--
451.8.3.2
46
diff --git a/recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
new file mode 100644
index 00000000..d355e488
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
@@ -0,0 +1,41 @@
1From 6d28b0ec1bc93fea7502fadfbc12f8198ccf9d14 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
3Date: Wed, 5 Jun 2013 19:23:32 +0200
4Subject: [PATCH 3/3] Fix wrong calculation of viewPort for transitions
5
6Viewport is calculated wrong for horizontal layout in a second instance
7
8Task-number: QTBUG-29944
9Task-Number: QTBUG-31546
10
11Upstream-Status: Pending
12
13Looks like backport of https://codereview.qt-project.org/49226 but this
14one was applied in previous patch, this change looks the same but is
15in different part of qquickitemview.cpp and ISN'T applied yet in dev
16branch.
17
18Signed-off-by: Florian Haenel <florian.haenel@lge.com>
19Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20
21Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe
22---
23 src/quick/items/qquickitemview.cpp | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
27index a6dabee..290f283 100644
28--- a/src/quick/items/qquickitemview.cpp
29+++ b/src/quick/items/qquickitemview.cpp
30@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout()
31
32 prepareVisibleItemTransitions();
33
34- QRectF viewBounds(0, position(), q->width(), q->height());
35+ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height());
36 for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin();
37 it != releasePendingTransition.end(); ) {
38 FxViewItem *item = *it;
39--
401.8.3.2
41
diff --git a/recipes-qt/qt5/qtdeclarative_5.1.0.bb b/recipes-qt/qt5/qtdeclarative_5.1.0.bb
new file mode 100644
index 00000000..2421bdbf
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative_5.1.0.bb
@@ -0,0 +1,15 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI += " \
5 file://0001-qmltestexample-fix-link.patch \
6 file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
7"
8
9SRC_URI[md5sum] = "604a6e3ae051a21aac0024694d55cb3b"
10SRC_URI[sha256sum] = "d8849755c17fca9bb44c09c442001bc5593c24986ea616c536719414e85d90cc"
11
12# /usr/lib/qt5/qml/QtQuick/Dialogs/images/*.png
13FILES_${PN}-qmlplugins += " \
14 ${OE_QMAKE_PATH_QML}/*/*/*/*.png \
15"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb
new file mode 100644
index 00000000..3d24d7ab
--- /dev/null
+++ b/recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "0e38ef686197fbf1207a9510f07d0656"
5SRC_URI[sha256sum] = "ea30ed7c3523d1a800a63cb888096cef89c61b590bfc81ba815ab9b12e283a89"
diff --git a/recipes-qt/qt5/qtimageformats_5.1.0.bb b/recipes-qt/qt5/qtimageformats_5.1.0.bb
new file mode 100644
index 00000000..b7a8b08d
--- /dev/null
+++ b/recipes-qt/qt5/qtimageformats_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "6dfab2e481e90ce74e89c646b91a11ca"
5SRC_URI[sha256sum] = "c740442a46715e32a45f60e42fda76afd8430bf0004ee1f7147aa77cf92ed846"
diff --git a/recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch
new file mode 100644
index 00000000..1f94e4ce
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch
@@ -0,0 +1,32 @@
1From 973d4f0974c0b9c2504c56a2b9b8d6c709275ee4 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 4 Dec 2012 11:20:13 -0800
4Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side
5
6Upstream-Status: Inappropriate [configuration]
7
8Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
9---
10 src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++--
11 1 file changed, 7 insertions(+), 2 deletions(-)
12
13diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
14index 16beb02..5e327f7 100644
15--- a/src/tools/mkv8snapshot/mkv8snapshot.pro
16+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro
17@@ -24,5 +24,10 @@ unix:LIBS += -lpthread
18
19 # We don't need to install this tool, it's only used for building v8.
20 # However we do have to make sure that 'make install' builds it.
21-dummytarget.CONFIG = dummy_install
22-INSTALLS += dummytarget
23+#dummytarget.CONFIG = dummy_install
24+#INSTALLS += dummytarget
25+
26+# Install the tool so that during target cross compilation we have access to the native side binary
27+target.path = $$[QT_HOST_BINS]
28+INSTALLS += target
29+
30--
311.8.3.2
32
diff --git a/recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch
new file mode 100644
index 00000000..d9bb5b43
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch
@@ -0,0 +1,31 @@
1From b0610cdb0c53be6da6d8f94be9af40bf50075368 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 28 Apr 2013 02:45:01 +0200
4Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set
5
6Upstream-Status: Pending
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 src/v8/v8.pro | 5 ++++-
11 1 file changed, 4 insertions(+), 1 deletion(-)
12
13diff --git a/src/v8/v8.pro b/src/v8/v8.pro
14index 2be6a19..d3da4e1 100644
15--- a/src/v8/v8.pro
16+++ b/src/v8/v8.pro
17@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/..
18 include(v8.pri)
19
20 contains(QT_CONFIG, v8snapshot) {
21- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
22+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix()
23+ !exists($$mkv8snapshot.tool): \
24+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix()
25+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT}
26 DUMMY_FILE = v8.pro
27 mkv8snapshot.input = DUMMY_FILE
28 mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
29--
301.8.3.2
31
diff --git a/recipes-qt/qt5/qtjsbackend-native_5.1.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.1.0.bb
new file mode 100644
index 00000000..fcc7cde6
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend-native_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "bb4a74f3cd1db59274c9f4aaca0912af"
5SRC_URI[sha256sum] = "8df057d527f98b1c2aa2941ff22adaf9b9c6441ea0e6c44f91f49bbcdbab57ce"
diff --git a/recipes-qt/qt5/qtjsbackend_5.1.0.bb b/recipes-qt/qt5/qtjsbackend_5.1.0.bb
new file mode 100644
index 00000000..fcc7cde6
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "bb4a74f3cd1db59274c9f4aaca0912af"
5SRC_URI[sha256sum] = "8df057d527f98b1c2aa2941ff22adaf9b9c6441ea0e6c44f91f49bbcdbab57ce"
diff --git a/recipes-qt/qt5/qtmultimedia_5.1.0.bb b/recipes-qt/qt5/qtmultimedia_5.1.0.bb
new file mode 100644
index 00000000..97ef3ba6
--- /dev/null
+++ b/recipes-qt/qt5/qtmultimedia_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "ae0301809ca504b4b67d817fd46f9a2e"
5SRC_URI[sha256sum] = "1df262e4d8d16f83511a096974a5a14af21d366493c5302d549e3dc52fa0b00f"
diff --git a/recipes-qt/qt5/qtquick1_5.1.0.bb b/recipes-qt/qt5/qtquick1_5.1.0.bb
new file mode 100644
index 00000000..c29f96ed
--- /dev/null
+++ b/recipes-qt/qt5/qtquick1_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "0c4c7b81258dd889e020b6025f542387"
5SRC_URI[sha256sum] = "51d83033c2012de9806be13434b48430401c395c0d0a58390ada290581b3fc5f"
diff --git a/recipes-qt/qt5/qtscript_5.1.0.bb b/recipes-qt/qt5/qtscript_5.1.0.bb
new file mode 100644
index 00000000..d9bd00fc
--- /dev/null
+++ b/recipes-qt/qt5/qtscript_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "c9348cdc39826c717c75b930a7b5a3bf"
5SRC_URI[sha256sum] = "0cbe2e472657673ec8bd2f1ad133140b498292065159e67355f427e903c46d9b"
diff --git a/recipes-qt/qt5/qtsensors_5.1.0.bb b/recipes-qt/qt5/qtsensors_5.1.0.bb
new file mode 100644
index 00000000..9d314eae
--- /dev/null
+++ b/recipes-qt/qt5/qtsensors_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "bcb4b546d1d39f2e27425b48bae90ac2"
5SRC_URI[sha256sum] = "5cfd74323e8145a282fe840c47c639c064e832263744a24270f326a1464830ee"
diff --git a/recipes-qt/qt5/qtsvg_5.1.0.bb b/recipes-qt/qt5/qtsvg_5.1.0.bb
new file mode 100644
index 00000000..b54484df
--- /dev/null
+++ b/recipes-qt/qt5/qtsvg_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "394d33cc5d6b7aafbaae5a4f1d9e6652"
5SRC_URI[sha256sum] = "50fc66ada43472e42245c18095e9eac84b496a634736cf55aac81326e4aad54a"
diff --git a/recipes-qt/qt5/qtwebkit_5.1.0.bb b/recipes-qt/qt5/qtwebkit_5.1.0.bb
new file mode 100644
index 00000000..77725e3b
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "fad7e7d6637719c2be101f9b3957d451"
5SRC_URI[sha256sum] = "b49c4cfae697ea67142e7b35ecb0e3fec06814153e8226b8c6655c4dafc92ac3"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.1.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.1.0.bb
new file mode 100644
index 00000000..f0541595
--- /dev/null
+++ b/recipes-qt/qt5/qtxmlpatterns_5.1.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "1d1ebc4d6efa4d05368c0c716858d314"
5SRC_URI[sha256sum] = "9d06493a4387d19e561f79f79c0a9c4c333eb764d64af54dc05f13a978694537"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-23 05:20:49 +0000