summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/qt5-versions.inc4
-rw-r--r--recipes-qt/qt5/qt5-5.0.0.inc18
-rw-r--r--recipes-qt/qt5/qt5-5.0.1.inc18
-rw-r--r--recipes-qt/qt5/qt5-5.0.2.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_5.0.0.bb7
-rw-r--r--recipes-qt/qt5/qtbase-native_5.0.1.bb7
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch304
-rw-r--r--recipes-qt/qt5/qtbase/0001-Always-build-uic.patch31
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch36
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch221
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch50
-rw-r--r--recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch37
-rw-r--r--recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch30
-rw-r--r--recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch29
-rw-r--r--recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch29
-rw-r--r--recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch68
-rw-r--r--recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch62
-rw-r--r--recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch46
-rw-r--r--recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch44
-rw-r--r--recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch37
-rw-r--r--recipes-qt/qt5/qtbase_5.0.0.bb10
-rw-r--r--recipes-qt/qt5/qtbase_5.0.1.bb9
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch39
-rw-r--r--recipes-qt/qt5/qtdeclarative_5.0.0.bb17
-rw-r--r--recipes-qt/qt5/qtdeclarative_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb14
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtimageformats_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtimageformats_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtjsbackend-native_5.0.0.bb12
-rw-r--r--recipes-qt/qt5/qtjsbackend-native_5.0.1.bb12
-rw-r--r--recipes-qt/qt5/qtjsbackend_5.0.0.bb12
-rw-r--r--recipes-qt/qt5/qtjsbackend_5.0.1.bb12
-rw-r--r--recipes-qt/qt5/qtmultimedia_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtmultimedia_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtquick1_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtquick1_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtscript_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtscript_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtsvg_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtsvg_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtwebkit_5.0.0.bb8
-rw-r--r--recipes-qt/qt5/qtwebkit_5.0.1.bb7
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_5.0.1.bb13
45 files changed, 2 insertions, 1412 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index 63e1abee..01a5a25a 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -1,7 +1,7 @@
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.0", "5.0.1", "5.0.2", "5.0.2+git%" 2# possible values now "5.0.2", "5.0.2+git%"
3 3
4QT5_VERSION ?= "5.0.1" 4QT5_VERSION ?= "5.0.2"
5 5
6PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" 6PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
7PREFERRED_VERSION_qtbase = "${QT5_VERSION}" 7PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.0.inc
deleted file mode 100644
index 85811c0f..00000000
--- a/recipes-qt/qt5/qt5-5.0.0.inc
+++ /dev/null
@@ -1,18 +0,0 @@
1# Copyright (C) 2012 O.S. Systems Software LTDA.
2
3QT_VERSION ?= "${PV}"
4
5# it's different for RC versions
6QT_VERSION_DIR ?= "${QT_VERSION}"
7
8SRC_URI += " \
9 http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
10"
11
12S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}"
13
14LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
15LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \
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/qt5-5.0.1.inc b/recipes-qt/qt5/qt5-5.0.1.inc
deleted file mode 100644
index 85811c0f..00000000
--- a/recipes-qt/qt5/qt5-5.0.1.inc
+++ /dev/null
@@ -1,18 +0,0 @@
1# Copyright (C) 2012 O.S. Systems Software LTDA.
2
3QT_VERSION ?= "${PV}"
4
5# it's different for RC versions
6QT_VERSION_DIR ?= "${QT_VERSION}"
7
8SRC_URI += " \
9 http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
10"
11
12S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}"
13
14LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
15LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \
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/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc
index f99809ec..e2a56e5c 100644
--- a/recipes-qt/qt5/qt5-5.0.2.inc
+++ b/recipes-qt/qt5/qt5-5.0.2.inc
@@ -6,8 +6,6 @@ QT_VERSION ?= "${PV}"
6# it's different for RC versions 6# it's different for RC versions
7QT_VERSION_DIR ?= "${QT_VERSION}" 7QT_VERSION_DIR ?= "${QT_VERSION}"
8 8
9DEFAULT_PREFERENCE = "-1"
10
11SRC_URI += " \ 9SRC_URI += " \
12 http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ 10 http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
13" 11"
diff --git a/recipes-qt/qt5/qtbase-native_5.0.0.bb b/recipes-qt/qt5/qtbase-native_5.0.0.bb
deleted file mode 100644
index f791b600..00000000
--- a/recipes-qt/qt5/qtbase-native_5.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4PR = "${INC_PR}.0"
5
6SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e"
7SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500"
diff --git a/recipes-qt/qt5/qtbase-native_5.0.1.bb b/recipes-qt/qt5/qtbase-native_5.0.1.bb
deleted file mode 100644
index 2dce2c1d..00000000
--- a/recipes-qt/qt5/qtbase-native_5.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4PR = "${INC_PR}.0"
5
6SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df"
7SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
deleted file mode 100644
index f4645f69..00000000
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ /dev/null
@@ -1,304 +0,0 @@
1From 4edde46f33aacc24fffa021adcc7e0d68ba414a3 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/12] 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 89246c8..0ab8eee 100755
45--- a/configure
46+++ b/configure
47@@ -216,6 +216,16 @@ getQMakeConf()
48 getQMakeConf3 "$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@@ -224,6 +234,16 @@ getXQMakeConf()
65 getQMakeConf3 "$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@@ -707,6 +727,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@@ -2623,7 +2655,7 @@ else
101 CFG_FRAMEWORK=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 if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
109@@ -2632,7 +2664,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@@ -3587,6 +3619,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. Please wait..."
133@@ -3625,11 +3665,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 [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then
149 EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION"
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.2.1
304
diff --git a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
deleted file mode 100644
index 3f2e3fd9..00000000
--- a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 1092de02d1ac256a8c56fb5b5e590a4df8188acb 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
9Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
10---
11 src/tools/tools.pro | 4 ++--
12 1 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/src/tools/tools.pro b/src/tools/tools.pro
15index c67d6bf..b6f3b39 100644
16--- a/src/tools/tools.pro
17+++ b/src/tools/tools.pro
18@@ -1,8 +1,8 @@
19 TEMPLATE = subdirs
20
21-TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc
22+TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic
23 contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
24-!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic
25+
26 # Set subdir and respective target name
27 src_tools_bootstrap.subdir = $$PWD/bootstrap
28 src_tools_bootstrap.target = sub-tools-bootstrap
29--
301.7.4.1
31
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
deleted file mode 100644
index fc8a481e..00000000
--- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From a836731e94223d49ef05fdabe7905dd1b25c647c 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/12] 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 a8dc086..8138fff 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.2.1
36
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
deleted file mode 100644
index 8c100bc5..00000000
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ /dev/null
@@ -1,221 +0,0 @@
1From 3b0a595bbe9d5bce898fc5a84c9bb39c976b9f7d 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/12] 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 | 15 +++++++++++----
20 src/corelib/global/qlibraryinfo.cpp | 3 ++-
21 src/corelib/global/qlibraryinfo.h | 1 +
22 tools/configure/configureapp.cpp | 8 ++++++++
23 8 files changed, 42 insertions(+), 8 deletions(-)
24
25diff --git a/configure b/configure
26index 0ab8eee..50f1ef2 100755
27--- a/configure
28+++ b/configure
29@@ -928,6 +928,7 @@ CFG_GCC_SYSROOT="yes"
30 QT_HOST_PREFIX=
31 QT_HOST_BINS=
32 QT_HOST_DATA=
33+QT_EXTERNAL_HOST_BINS=
34
35 #flags for SQL drivers
36 QT_CFLAGS_PSQL=
37@@ -1026,7 +1027,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|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig)
42+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-external-hostbindir)
43 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
44 shift
45 VAL="$1"
46@@ -1223,6 +1224,9 @@ while [ "$#" -gt 0 ]; do
47 hostbindir)
48 QT_HOST_BINS="$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@@ -2921,6 +2925,11 @@ else
57 QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"`
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@@ -3087,6 +3096,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@@ -3558,6 +3570,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
79 "qt_hpfxpath=$QT_HOST_PREFIX",
80 "qt_hbinpath=$QT_HOST_BINS",
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 389f241..e249960 100644
88--- a/mkspecs/features/qt_functions.prf
89+++ b/mkspecs/features/qt_functions.prf
90@@ -194,7 +194,10 @@ defineTest(qtAddModules) {
91 defineTest(qtPrepareTool) {
92 $$1 = $$eval(QT_TOOL.$${2}.command)
93 isEmpty($$1) {
94- $$1 = $$[QT_HOST_BINS/get]/$$2
95+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
96+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
97+ $$1 = $$[QT_HOST_BINS/get]/$$2
98+ }
99 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) {
100 exists($$eval($$1).bat) {
101 $$1 = $$eval($$1).bat
102diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
103index 16db6c7..5518933 100644
104--- a/mkspecs/features/qt_tool.prf
105+++ b/mkspecs/features/qt_tool.prf
106@@ -31,7 +31,7 @@ load(qt_targets)
107
108 # If we are doing a prefix build, create a "module" pri which enables
109 # qtPrepareTool() to work with the non-installed build.
110-!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache) {
111+!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
112
113 isEmpty(MODULE):MODULE = $$TARGET
114
115diff --git a/qmake/property.cpp b/qmake/property.cpp
116index bbd4734..dca0c58 100644
117--- a/qmake/property.cpp
118+++ b/qmake/property.cpp
119@@ -74,6 +74,7 @@ static const struct {
120 { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true },
121 { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
122 { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, 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 e66d9fb..a6ae763 100644
129--- a/qtbase.pro
130+++ b/qtbase.pro
131@@ -68,17 +68,24 @@ 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
150-equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat
151+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
152+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt
153+}
154+equals(QMAKE_HOST.os, Windows) {
155+ syncqt.files = $${syncqt.files}.bat
156+}
157 INSTALLS += syncqt
158
159 #mkspecs
160diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
161index 8138fff..301643f 100644
162--- a/src/corelib/global/qlibraryinfo.cpp
163+++ b/src/corelib/global/qlibraryinfo.cpp
164@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
165 */
166
167 static const struct {
168- char key[19], value[13];
169+ char key[21], value[13];
170 } qtConfEntries[] = {
171 { "Prefix", "." },
172 { "Documentation", "doc" }, // should be ${Data}/doc
173@@ -291,6 +291,7 @@ static const struct {
174 { "HostPrefix", "" },
175 { "HostBinaries", "bin" },
176 { "HostData", "." },
177+ { "ExternalHostBinaries", "" },
178 { "TargetSpec", "" },
179 { "HostSpec", "" },
180 #endif
181diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
182index a574b4b..1535d20 100644
183--- a/src/corelib/global/qlibraryinfo.h
184+++ b/src/corelib/global/qlibraryinfo.h
185@@ -85,6 +85,7 @@ public:
186 HostPrefixPath,
187 HostBinariesPath,
188 HostDataPath,
189+ ExternalHostBinariesPath,
190 TargetSpecPath,
191 HostSpecPath,
192 LastHostPath = HostSpecPath,
193diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
194index 126643e..0e01ab5 100644
195--- a/tools/configure/configureapp.cpp
196+++ b/tools/configure/configureapp.cpp
197@@ -1143,6 +1143,13 @@ void Configure::parseCmdLine()
198 dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i);
199 }
200
201+ else if (configCmdLine.at(i) == "-external-hostbindir") {
202+ ++i;
203+ if (i == argCount)
204+ break;
205+ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i);
206+ }
207+
208 else if (configCmdLine.at(i) == "-make-tool") {
209 ++i;
210 if (i == argCount)
211@@ -3627,6 +3634,7 @@ void Configure::generateQConfigCpp()
212 << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl
213 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
214 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
215+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl
216 << " \"qt_targspec=" << targSpec << "\"," << endl
217 << " \"qt_hostspec=" << hostSpec << "\"," << endl
218 << "#endif" << endl
219--
2201.8.2.1
221
diff --git a/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch
deleted file mode 100644
index d39130c1..00000000
--- a/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From ff72f8350e8b2ded813163150a7d1874061ed589 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/12] 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 | 2 +-
16 2 files changed, 6 insertions(+), 2 deletions(-)
17
18diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
19index e249960..105ba4c 100644
20--- a/mkspecs/features/qt_functions.prf
21+++ b/mkspecs/features/qt_functions.prf
22@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) {
23 $$1 = $$eval(QT_TOOL.$${2}.command)
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/get]/$$2
33 }
34 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) {
35diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
36index 5518933..b0e4f28 100644
37--- a/mkspecs/features/qt_tool.prf
38+++ b/mkspecs/features/qt_tool.prf
39@@ -31,7 +31,7 @@ load(qt_targets)
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-!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
44+!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):!exists($$[QT_EXTERNAL_HOST_BINS]) {
45
46 isEmpty(MODULE):MODULE = $$TARGET
47
48--
491.8.2.1
50
diff --git a/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch b/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch
deleted file mode 100644
index a16731a9..00000000
--- a/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1commit e28c03cb829c229209090d7939a9aba1af1fdea9
2Author: aavit <eirik.aavitsland@digia.com>
3Date: Tue Feb 19 18:11:16 2013 +0100
4
5 Fix reentrancy problem in image reading
6
7 There were race conditions when accessing the plugin factory and
8 the image reader plugins from different threads; ref QTBUG-29281.
9 Added a mutex lock to avoid.
10
11 Change-Id: Ic1a3b6cbaf5603f1bcf7025b58247a9a3f6d08a9
12 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
13
14Upstream-Status: Backport (from 5.1.0)
15
16diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
17index 5eaf7bb..6847786 100644
18--- a/src/gui/image/qimagereader.cpp
19+++ b/src/gui/image/qimagereader.cpp
20@@ -133,6 +133,7 @@
21 // factory loader
22 #include <qcoreapplication.h>
23 #include <private/qfactoryloader_p.h>
24+#include <QMutexLocker>
25
26 // image handlers
27 #include <private/qbmphandler_p.h>
28@@ -232,6 +233,9 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
29 QByteArray suffix;
30
31 #ifndef QT_NO_IMAGEFORMATPLUGIN
32+ static QMutex mutex;
33+ QMutexLocker locker(&mutex);
34+
35 typedef QMultiMap<int, QString> PluginKeyMap;
36
37 // check if we have plugins that support the image format
diff --git a/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch
deleted file mode 100644
index 319aae6f..00000000
--- a/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 240fb45541c06103e8a930beeb5ee59a15b529bf 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/12] 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 50f1ef2..8710c28 100755
17--- a/configure
18+++ b/configure
19@@ -3641,7 +3641,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. Please wait..."
26
27 mkdir -p "$outpath/qmake" || exit
28--
291.8.2.1
30
diff --git a/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch
deleted file mode 100644
index c639c172..00000000
--- a/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 892351a55c3f6a033a1823e104315cb0f03b454d 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/12] 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.2.1
29
diff --git a/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
deleted file mode 100644
index c40c66b1..00000000
--- a/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 9928daa856cd7433618df38b263e029fb9948679 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/12] 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 0e01ab5..6bb7986 100644
14--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp
16@@ -3061,8 +3061,8 @@ void Configure::generateQConfigPri()
17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
18 if (!dictionary["XQMAKESPEC"].isEmpty() && !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.2.1
29
diff --git a/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch
deleted file mode 100644
index 8d40e4f2..00000000
--- a/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From 063936d0daabacad8c9b8e68adf9423d54846290 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/12] 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 | 16 ++++++++++++++--
27 1 file changed, 14 insertions(+), 2 deletions(-)
28
29diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
30index 50e9469..9532377 100644
31--- a/mkspecs/features/qt_module.prf
32+++ b/mkspecs/features/qt_module.prf
33@@ -191,18 +191,30 @@ unix|win32-g++* {
34 rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
35 else: \
36 rplbase = $$[QT_INSTALL_PREFIX/get]
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 = $$[QT_INSTALL_LIBS/raw]
45- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
46+ lafile_replace.match = $$rplbase
47+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
48+
49+ !isEmpty(SYSROOT): \
50+ rplbase = $$[SYSROOT] \
51+ lafile_replace.match = $$rplbase \
52+ lafile_replace.replace = "=" \
53+
54+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
55 }
56
57 unix {
58 CONFIG += create_libtool explicitlib
59 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
60 QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
61- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
62+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace
63 }
64
65 unix|win32-g++* {
66--
671.8.2.1
68
diff --git a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch
deleted file mode 100644
index dde3b95b..00000000
--- a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From 1a0133993cc7924208dd4a0d818599accbcf999e 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/12] 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 9532377..73053f7 100644
23--- a/mkspecs/features/qt_module.prf
24+++ b/mkspecs/features/qt_module.prf
25@@ -195,17 +195,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 }
60--
611.8.2.1
62
diff --git a/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch
deleted file mode 100644
index ff8aaa1d..00000000
--- a/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 668c20fe721aba2057c8e929e5029c423a687360 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/12] 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 | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
16index 90e1e0f..0750849 100644
17--- a/mkspecs/features/wayland-scanner.prf
18+++ b/mkspecs/features/wayland-scanner.prf
19@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS
20 wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
21 wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
22
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@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS
29 wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
30 wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
31
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@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES
38 wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
39 wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
40
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--
451.8.2.1
46
diff --git a/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
deleted file mode 100644
index d1402124..00000000
--- a/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 62c2c404238e007021a80fcf62b51173be23a67e 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/12] 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 8710c28..8b97cc2 100755
18--- a/configure
19+++ b/configure
20@@ -740,20 +740,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.2.1
44
diff --git a/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
deleted file mode 100644
index 5d7cbc34..00000000
--- a/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From b0a008c649f76e0353f49f9c953e9d8141e5927a 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/12] 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 39144e7..de48b07 100644
18--- a/mkspecs/features/configure.prf
19+++ b/mkspecs/features/configure.prf
20@@ -54,12 +54,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.2.1
37
diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb
deleted file mode 100644
index 7f4cf298..00000000
--- a/recipes-qt/qt5/qtbase_5.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4PR = "${INC_PR}.0"
5
6SRC_URI += "file://0004-Disable-mkv8snapshot.patch"
7SRC_URI += "file://0005-AddSynchoronization-qimagereader.patch"
8
9SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e"
10SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500"
diff --git a/recipes-qt/qt5/qtbase_5.0.1.bb b/recipes-qt/qt5/qtbase_5.0.1.bb
deleted file mode 100644
index dfcb742f..00000000
--- a/recipes-qt/qt5/qtbase_5.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4PR = "${INC_PR}.0"
5
6SRC_URI += "file://0004-Disable-mkv8snapshot.patch"
7
8SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df"
9SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch b/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch
deleted file mode 100644
index 650e603a..00000000
--- a/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 27be7a832f017653ffda705407bb7a64246eda1f Mon Sep 17 00:00:00 2001
2From: Daniel d'Andrada <daniel.dandrada@canonical.com>
3Date: Tue, 18 Dec 2012 10:51:21 -0200
4Subject: [PATCH] Flickable: Fix bug when flicking twice using touches
5
6When you flick twice in rapid succession, in the same direction,
7the expected behavior is for flickable to be moving quite fast in the
8direction of the flicks.
9
10But when you flicked using touch events instead of mouse ones,
11the second flick caused Flickable to immediately halt. This change fixes it.
12
13Upstream-Status: Backport
14
15Change-Id: I02bd02fed30bd4a98959194e04f0a26b4420cd05
16Reviewed-by: Andras Becsi <andras.becsi@digia.com>
17---
18 src/quick/items/qquickflickable.cpp | 5 +++++
19 1 file changed, 5 insertions(+)
20
21diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
22index 6e5e6b7..88ef20f 100644
23--- a/src/quick/items/qquickflickable.cpp
24+++ b/src/quick/items/qquickflickable.cpp
25@@ -2038,6 +2038,11 @@ bool QQuickFlickable::sendMouseEvent(QQuickItem *item, QMouseEvent *event)
26
27 QQuickWindow *c = window();
28 QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
29+ if (grabber == this && d->stealMouse) {
30+ // we are already the grabber and we do want the mouse event to ourselves.
31+ return true;
32+ }
33+
34 bool grabberDisabled = grabber && !grabber->isEnabled();
35 bool stealThisEvent = d->stealMouse;
36 if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab() || grabberDisabled)) {
37--
381.7.9.5
39
diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb
deleted file mode 100644
index 1e9876a9..00000000
--- a/recipes-qt/qt5/qtdeclarative_5.0.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0 and 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.1"
11
12SRC_URI += " \
13 file://0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch \
14"
15
16SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832"
17SRC_URI[sha256sum] = "eb13966ecaa61baff53f19b03e97f0e7ca7103a25d89c7540f6e8d7d98bf59bd"
diff --git a/recipes-qt/qt5/qtdeclarative_5.0.1.bb b/recipes-qt/qt5/qtdeclarative_5.0.1.bb
deleted file mode 100644
index df0ab3de..00000000
--- a/recipes-qt/qt5/qtdeclarative_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0 and 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "91bb22db9501847e7549e8a431d81b78"
13SRC_URI[sha256sum] = "fa7c6941626ff4a40419f9be286f478b0461ac57f4a058035b3e1a9043dfee85"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb
deleted file mode 100644
index eabe4062..00000000
--- a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "1031f8021a2b2e3a2387d94103e8868e"
13SRC_URI[sha256sum] = "e9cf71b4da1a1e879845f1fb1a532408ff6a0875e407a65d6bb3ce3dff0fe942"
14
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb
deleted file mode 100644
index b42fbb39..00000000
--- a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "99b1259b992c31ab4c938a4b69bb8c71"
13SRC_URI[sha256sum] = "448c66b45e1744c1470ea839266777c41cc97fa2426b9915b1923c3ef1ae6a82"
diff --git a/recipes-qt/qt5/qtimageformats_5.0.0.bb b/recipes-qt/qt5/qtimageformats_5.0.0.bb
deleted file mode 100644
index 2072116b..00000000
--- a/recipes-qt/qt5/qtimageformats_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "cf2955d48e5674bfad6def4dd3acacca"
13SRC_URI[sha256sum] = "9280f13cdc58b02ab4562538fc381afa36df071564e0404a2ee48ecd0af659c6"
diff --git a/recipes-qt/qt5/qtimageformats_5.0.1.bb b/recipes-qt/qt5/qtimageformats_5.0.1.bb
deleted file mode 100644
index 99227a31..00000000
--- a/recipes-qt/qt5/qtimageformats_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "c3f357657b68d4c4788f8c7f71be519b"
13SRC_URI[sha256sum] = "145cc3d46a338ee8f28ddbebc031044db7d7a72e8c269d3daf542fc4b0e20018"
diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb
deleted file mode 100644
index e6c04106..00000000
--- a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0 and 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7"
8
9PR = "${INC_PR}.0"
10
11SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc"
12SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39"
diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb
deleted file mode 100644
index 41b9576e..00000000
--- a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0 and 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7"
8
9PR = "${INC_PR}.0"
10
11SRC_URI[md5sum] = "af5ccb9d5ab589df03eb0b12fb5ab4cd"
12SRC_URI[sha256sum] = "3fc8fca258b8c73f935e509c5c1efdc104725e4b44e240e9031b12901e7b971a"
diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb
deleted file mode 100644
index e6c04106..00000000
--- a/recipes-qt/qt5/qtjsbackend_5.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0 and 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7"
8
9PR = "${INC_PR}.0"
10
11SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc"
12SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39"
diff --git a/recipes-qt/qt5/qtjsbackend_5.0.1.bb b/recipes-qt/qt5/qtjsbackend_5.0.1.bb
deleted file mode 100644
index 41b9576e..00000000
--- a/recipes-qt/qt5/qtjsbackend_5.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0 and 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7"
8
9PR = "${INC_PR}.0"
10
11SRC_URI[md5sum] = "af5ccb9d5ab589df03eb0b12fb5ab4cd"
12SRC_URI[sha256sum] = "3fc8fca258b8c73f935e509c5c1efdc104725e4b44e240e9031b12901e7b971a"
diff --git a/recipes-qt/qt5/qtmultimedia_5.0.0.bb b/recipes-qt/qt5/qtmultimedia_5.0.0.bb
deleted file mode 100644
index 20e12c01..00000000
--- a/recipes-qt/qt5/qtmultimedia_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "bc24e00ded809c0c457ff3480c6d4198"
13SRC_URI[sha256sum] = "55915e30ba089dd6f9cd5e0dfe93e231c4d741da0f85a2e16d5a47f948424cc4"
diff --git a/recipes-qt/qt5/qtmultimedia_5.0.1.bb b/recipes-qt/qt5/qtmultimedia_5.0.1.bb
deleted file mode 100644
index 3b47de08..00000000
--- a/recipes-qt/qt5/qtmultimedia_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "aee9c86a7ff64dfc905ccaef33f0a967"
13SRC_URI[sha256sum] = "e87fe8fbc1465840458a88de0be10f096374fb7cd0888c703710c0ecc936d414"
diff --git a/recipes-qt/qt5/qtquick1_5.0.0.bb b/recipes-qt/qt5/qtquick1_5.0.0.bb
deleted file mode 100644
index 12d48230..00000000
--- a/recipes-qt/qt5/qtquick1_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "04bc1ae59321676eb0239f8a3f9dcd95"
13SRC_URI[sha256sum] = "3d0236546b1d2bdcfb2aa36091fd4cfbfaa64c89c69df9d6e4b7fa38a4c40504"
diff --git a/recipes-qt/qt5/qtquick1_5.0.1.bb b/recipes-qt/qt5/qtquick1_5.0.1.bb
deleted file mode 100644
index fe762d19..00000000
--- a/recipes-qt/qt5/qtquick1_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "27820e2447e4c3b7ea75f5d4a16b9149"
13SRC_URI[sha256sum] = "507d02a5ffaa4f045f5b9cc807190d0f9db80c09b12feb4b4aa2fdb62d1bd529"
diff --git a/recipes-qt/qt5/qtscript_5.0.0.bb b/recipes-qt/qt5/qtscript_5.0.0.bb
deleted file mode 100644
index 00b21368..00000000
--- a/recipes-qt/qt5/qtscript_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "0759bd132e46fb6d95451764018f3a92"
13SRC_URI[sha256sum] = "8722e48c5f1f989ae920288fb4f5176ae5563775442d9f0aec1fc2e79869fb5f"
diff --git a/recipes-qt/qt5/qtscript_5.0.1.bb b/recipes-qt/qt5/qtscript_5.0.1.bb
deleted file mode 100644
index a8a97b8f..00000000
--- a/recipes-qt/qt5/qtscript_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "349691431c3cc1b03e2571bac7c6c852"
13SRC_URI[sha256sum] = "0b5901a78e8bc6853e7d549f2e8109794b2fb03b7ce22963eb3897eb97256f84"
diff --git a/recipes-qt/qt5/qtsvg_5.0.0.bb b/recipes-qt/qt5/qtsvg_5.0.0.bb
deleted file mode 100644
index f37bd5b2..00000000
--- a/recipes-qt/qt5/qtsvg_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "2dbed5aeae30bd492a38ca230e69e038"
13SRC_URI[sha256sum] = "be3674b5b058503ba90ae9138fec8de25c2e67a12059e937b3540e50a1ca08cf"
diff --git a/recipes-qt/qt5/qtsvg_5.0.1.bb b/recipes-qt/qt5/qtsvg_5.0.1.bb
deleted file mode 100644
index d27fc29a..00000000
--- a/recipes-qt/qt5/qtsvg_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "4bb52d0382d2557781c39cc27f380ce7"
13SRC_URI[sha256sum] = "bd053b808b64aad8bfbd3f5399444adedaff97aa16f03e54de91bb0873c20fd3"
diff --git a/recipes-qt/qt5/qtwebkit_5.0.0.bb b/recipes-qt/qt5/qtwebkit_5.0.0.bb
deleted file mode 100644
index 5cb6cde9..00000000
--- a/recipes-qt/qt5/qtwebkit_5.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4PR = "${INC_PR}.0"
5
6SRC_URI[md5sum] = "11556c74161612fd37ce70277de3baa4"
7SRC_URI[sha256sum] = "45981088d39ec044762861ee67acee8524ca20b13f1543a3045219aa9da21f9f"
8
diff --git a/recipes-qt/qt5/qtwebkit_5.0.1.bb b/recipes-qt/qt5/qtwebkit_5.0.1.bb
deleted file mode 100644
index 7054af98..00000000
--- a/recipes-qt/qt5/qtwebkit_5.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4PR = "${INC_PR}.0"
5
6SRC_URI[md5sum] = "8210ea90902c4ec526e1e5f7e719ad57"
7SRC_URI[sha256sum] = "e1f3a5ff14277a57fa4235d1e3d2ec0029fc888e6e4855b7f7874028ad827cfa"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb
deleted file mode 100644
index 59438fde..00000000
--- a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "5a76672bc411bb9cd1e0158d86706062"
13SRC_URI[sha256sum] = "689d7d89fe71b8fba53183825294bc769ffe1a60dae4ccf5fa3ee6fe704b5172"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb
deleted file mode 100644
index 1e8d3c12..00000000
--- a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.1
5LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
6 file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
7 file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
8"
9
10PR = "${INC_PR}.0"
11
12SRC_URI[md5sum] = "de8b08656a0e1496b18a091dfca82e59"
13SRC_URI[sha256sum] = "23cc183f96688992fee46537c8f50bbd20b20e4c92d29fff280e61758c97a59a"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-05-30 09:36:47 +0000