diff options
author | Eric Bénard <eric@eukrea.com> | 2011-09-20 22:07:33 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-04 13:46:26 +0100 |
commit | bcc8425b92dc9adc793473a9733559d377480811 (patch) | |
tree | fbf49c0367dec1ba8b697ce9e4dae45d62952e2c /meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch | |
parent | 2d053989a7136282a56814c28b0e7af258469804 (diff) | |
download | poky-bcc8425b92dc9adc793473a9733559d377480811.tar.gz |
qt4: Update to latest version 4.7.4
- 4.7.4 was release on the 1st of september, the changelog is available
here : http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/changes-4.7.4
and mostly contains bug fix.
- this patch include the fix for QTBUG-20925 which was a regression
against 4.7.3 : https://bugreports.qt.nokia.com/browse/QTBUG-20925
http://qt.gitorious.org/qt/qt/commit/852abfca6f4c349dce9b895956922f96d82df579
thanks to Paul Eggleton to point us to this bug.
(From OE-Core rev: 68189d7c372a861767b5db90376d61e165f9771b)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch new file mode 100644 index 0000000000..f302c5bd61 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthias Günther <matgnt@gmail.com> | ||
3 | Date: Wed, 12 May 2010 16:52:45 +0200 | ||
4 | Subject: [PATCH 1/9] Added Openembedded "-crossarch" option | ||
5 | |||
6 | Original Author: Michael Lauer <mickey@vanille-media.de> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | --- | ||
10 | configure | 7 ++++++- | ||
11 | 1 files changed, 6 insertions(+), 1 deletions(-) | ||
12 | |||
13 | diff --git a/configure b/configure | ||
14 | index facd192..9d15136 100755 | ||
15 | --- a/configure | ||
16 | +++ b/configure | ||
17 | @@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do | ||
18 | shift | ||
19 | VAL=$1 | ||
20 | ;; | ||
21 | - -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config) | ||
22 | + -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch) | ||
23 | VAR=`echo $1 | sed "s,^-\(.*\),\1,"` | ||
24 | shift | ||
25 | VAL="$1" | ||
26 | @@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do | ||
27 | xplatform) | ||
28 | XPLATFORM="$VAL" | ||
29 | ;; | ||
30 | + crossarch) | ||
31 | + CROSSARCH="$VAL" | ||
32 | + ;; | ||
33 | debug-and-release) | ||
34 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
35 | CFG_DEBUG_RELEASE="$VAL" | ||
36 | @@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then | ||
37 | CFG_ARCH=$CFG_HOST_ARCH | ||
38 | fi | ||
39 | |||
40 | +CFG_ARCH="$CROSSARCH" | ||
41 | + | ||
42 | if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then | ||
43 | if [ "$OPT_VERBOSE" = "yes" ]; then | ||
44 | echo " '$CFG_ARCH' is supported" | ||
45 | -- | ||
46 | 1.7.0.4 | ||
47 | |||