summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 21:00:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:28 +0100
commitaea363afaa193feee774dad30d81c516ea4a98fc (patch)
tree00b6ca102fe4b7c09da87d482ec04a90d128e03c /meta/recipes-qt/qt4/qt4-4.8.1
parent425df23c02b7dad3c843ec9959a51337ab450cd1 (diff)
downloadpoky-aea363afaa193feee774dad30d81c516ea4a98fc.tar.gz
qt4: replace all local patches with git patches with headers
* in preparation for upgrade to 4.8.3 (From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch43
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/fix_qkbdtty_qws.patch)21
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch34
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch29
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch27
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch28
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch)26
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch)26
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/target_qmake.patch)20
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch)13
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch)25
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch)20
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0012-Add-2bpp-support.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/0009-support-2bpp.patch)76
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0013-configure-add-crossarch-option.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch)32
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch)19
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0015-configure-add-nostrip-for-debug-packages.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/add_nostrip_for_debug_packages.diff)15
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch)26
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch)27
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch)17
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch46
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch63
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch41
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch39
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch18
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch30
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch29
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch35
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch50
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch29
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/set-OUTPUT_DIR-if-empty.patch19
30 files changed, 562 insertions, 361 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
new file mode 100644
index 0000000000..a3a8dae641
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -0,0 +1,43 @@
1From 51c37481a0c0ea946567ea2344107428e6d71590 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 01/22] 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, 5 insertions(+)
17
18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
19index 2862c2c..3a36b01 100644
20--- a/src/corelib/global/qlibraryinfo.cpp
21+++ b/src/corelib/global/qlibraryinfo.cpp
22@@ -54,6 +54,7 @@
23 QT_BEGIN_NAMESPACE
24 extern QString qmake_libraryInfoFile();
25 QT_END_NAMESPACE
26+#include <stdlib.h>
27 #else
28 # include "qcoreapplication.h"
29 #endif
30@@ -112,6 +113,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
31 #ifdef BOOTSTRAPPING
32 if(!QFile::exists(qtconfig))
33 qtconfig = qmake_libraryInfoFile();
34+ if (!QFile::exists(qtconfig)) {
35+ QByteArray config = getenv("QT_CONF_PATH");
36+ qtconfig = QFile::decodeName(config);
37+ }
38 #else
39 if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
40 #ifdef Q_OS_MAC
41--
421.7.12
43
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix_qkbdtty_qws.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
index c2aed5ca0f..021a6de41f 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/fix_qkbdtty_qws.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
@@ -1,4 +1,7 @@
1Upstream-Status: Pending 1From 419b6a19d3d506880fa705682613eaaeb7dcd9cf Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Wed, 26 Sep 2012 20:18:08 +0200
4Subject: [PATCH 02/22] qkbdtty_qws: fix build with old kernel headers
2 5
3This issue is that with C++ compiler process an old version of kernel 6This issue is that with C++ compiler process an old version of kernel
4header file, coincidently that file has a variable named 'new': 7header file, coincidently that file has a variable named 'new':
@@ -9,11 +12,18 @@ header file, coincidently that file has a variable named 'new':
9 12
10On mostly hosts it has been changed to: new -> newev. 13On mostly hosts it has been changed to: new -> newev.
11 14
15Upstream-Status: Pending
16
12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> 17Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
13======================================= 18Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19---
20 src/gui/embedded/qkbdtty_qws.cpp | 12 ++++++++++++
21 1 file changed, 12 insertions(+)
22
14diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp 23diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
15--- a/src/gui/embedded/qkbdtty_qws.cpp 2012-07-27 13:16:58.420198350 +0800 24index f4b8461..4cee2e7 100644
16+++ b/src/gui/embedded/qkbdtty_qws.cpp 2012-07-27 13:24:43.924191127 +0800 25--- a/src/gui/embedded/qkbdtty_qws.cpp
26+++ b/src/gui/embedded/qkbdtty_qws.cpp
17@@ -54,8 +54,20 @@ 27@@ -54,8 +54,20 @@
18 28
19 #if defined Q_OS_LINUX 29 #if defined Q_OS_LINUX
@@ -35,3 +45,6 @@ diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
35 # include "qscreen_qws.h" 45 # include "qscreen_qws.h"
36 # include "qwindowsystem_qws.h" 46 # include "qwindowsystem_qws.h"
37 # include "qapplication.h" 47 # include "qapplication.h"
48--
491.7.12
50
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
new file mode 100644
index 0000000000..859a037aa8
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
@@ -0,0 +1,34 @@
1From 96bee73bdf663ddeb2a5d48cab9c5e4df65ba295 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 1 May 2012 07:48:15 +0200
4Subject: [PATCH 03/22] webkit2: set OUTPUT_DIR value if empty
5
6Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
7now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
8
9First reported here:
10http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html
11
12Upstream-Status: Pending
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++
17 1 file changed, 2 insertions(+)
18
19diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
20index 006a88c..5e17193 100644
21--- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
22+++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
23@@ -3,6 +3,8 @@ TARGET = dummy
24
25 CONFIG -= debug_and_release
26
27+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
28+
29 CONFIG(standalone_package) {
30 isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
31 isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
32--
331.7.12
34
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
new file mode 100644
index 0000000000..e147375b7d
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
@@ -0,0 +1,29 @@
1From aa1788b0ec0b9b7c0e1a7c6bd9ef5c9555361014 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Wed, 26 Sep 2012 20:24:20 +0200
4Subject: [PATCH 04/22] configure: qmake is already built in qt4-tools-native,
5 so disable it
6
7Upstream-Status: Inappropriate [configuration]
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 configure | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/configure b/configure
15index a706908..00b072a 100755
16--- a/configure
17+++ b/configure
18@@ -4816,7 +4816,7 @@ END {
19 }
20
21 # build qmake
22-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
23+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
24 echo "Creating qmake. Please wait..."
25
26 OLD_QCONFIG_H=
27--
281.7.12
29
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
deleted file mode 100644
index ed50c6df53..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Sat, 2 Jun 2007 16:06:59 +0200
4Subject: [PATCH] no qmake
5
6qmake is already built in qt4-tools-native, so disable it
7
8Ported from OE by: Yu Ke <ke.yu@intel.com>
9Upstream-Status: Inappropriate [configuration]
10
11---
12 configure | 2 +-
13 1 files changed, 1 insertions(+), 1 deletions(-)
14
15Index: qt-embedded-linux-opensource-src-4.4.3/configure
16===================================================================
17--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:03:43.000000000 +0100
18+++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-03-26 17:04:17.000000000 +0100
19@@ -3786,7 +3786,7 @@
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 OLD_QCONFIG_H=
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
new file mode 100644
index 0000000000..9171fa76dd
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
@@ -0,0 +1,28 @@
1From 1602cdf7f3bb548e63fca40b5bff8b9a75a144c5 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
3Date: Wed, 26 Sep 2012 20:27:44 +0200
4Subject: [PATCH 05/22] configure: set LFLAGS to pick up zlib from staging
5
6Upstream-Status: Pending
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 configure | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/configure b/configure
14index 00b072a..b1ba542 100755
15--- a/configure
16+++ b/configure
17@@ -611,7 +611,7 @@ fi
18 # initalize variables
19 #-------------------------------------------------------------------------------
20
21-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
22+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
23 for varname in $SYSTEM_VARIABLES; do
24 qmakevarname="${varname}"
25 # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
26--
271.7.12
28
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
index 45208ec415..51a6cfc51e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
@@ -1,13 +1,22 @@
1Use OE_QMAKE_* values to specify Qt utility paths 1From 074881d57e5d7ad23a7a784a75f4ffebf091e543 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:29:09 +0200
4Subject: [PATCH 06/22] configure: Use OE_QMAKE_* values to specify Qt utility
5 paths
2 6
3Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
4Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]
5 8
6Index: qt-everywhere-opensource-src-4.6.3/configure 9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7=================================================================== 10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 15:47:37.100607001 +0000 11---
9+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 15:49:14.576606999 +0000 12 configure | 10 +++++-----
10@@ -7198,11 +7198,11 @@ 13 1 file changed, 5 insertions(+), 5 deletions(-)
14
15diff --git a/configure b/configure
16index b1ba542..0231b7d 100755
17--- a/configure
18+++ b/configure
19@@ -8517,11 +8517,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
11 QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc 20 QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
12 21
13 #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR 22 #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -24,3 +33,6 @@ Index: qt-everywhere-opensource-src-4.6.3/configure
24 QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include 33 QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
25 QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib 34 QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
26 35
36--
371.7.12
38
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
index 6ee402fdc1..010575828e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qt-dbus-const.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
@@ -1,17 +1,26 @@
1Remove "const" usage that causes compile failure building nativesdk-qt4-tools 1From ff6a714f8256c6d98234066ba1788bee234b25a1 Mon Sep 17 00:00:00 2001
2 2From: Pavel Heimlich <tropikhajma@gmail.com>
3Upstream-Status: Denied [possible retry] 3Date: Wed, 26 Sep 2012 20:31:10 +0200
4Subject: [PATCH 07/22] dbus: Remove "const" usage that causes compile failure
5 building nativesdk-qt4-tools
4 6
5Patch has apparently been rejected upstream, not because it is invalid 7Patch has apparently been rejected upstream, not because it is invalid
6but because the submitter did not submit a merge request for it, so the 8but because the submitter did not submit a merge request for it, so the
7validity of the patch upstream is uncertain. For further details see: 9validity of the patch upstream is uncertain. For further details see:
8http://bugreports.qt.nokia.com/browse/QTBUG-17962 10http://bugreports.qt.nokia.com/browse/QTBUG-17962
9 11
10Original Author: Pavel Heimlich <tropikhajma at gmail.com> 12Upstream-Status: Denied [possible retry]
11 13
12--- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100 14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13+++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100 15---
14@@ -71,7 +71,7 @@ 16 src/dbus/qdbusintegrator.cpp | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
20index 5d97a8e..5014b8b 100644
21--- a/src/dbus/qdbusintegrator.cpp
22+++ b/src/dbus/qdbusintegrator.cpp
23@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
15 static bool isDebugging; 24 static bool isDebugging;
16 #define qDBusDebug if (!::isDebugging); else qDebug 25 #define qDBusDebug if (!::isDebugging); else qDebug
17 26
@@ -20,3 +29,6 @@ Original Author: Pavel Heimlich <tropikhajma at gmail.com>
20 29
21 static inline QString dbusServiceString() 30 static inline QString dbusServiceString()
22 { return *orgFreedesktopDBusString(); } 31 { return *orgFreedesktopDBusString(); }
32--
331.7.12
34
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/target_qmake.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
index 9b53aff172..57071c7167 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/target_qmake.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
@@ -1,17 +1,19 @@
1From e4b27237386b3dd864dd603de2ae54a707f5419f Mon Sep 17 00:00:00 2001 1From 049f44c260fb8956f0acf18355e3403638d2a084 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Mon, 27 Feb 2012 00:13:05 +0000 3Date: Wed, 26 Sep 2012 20:32:41 +0200
4Subject: [PATCH] Allow building a separate qmake for the target 4Subject: [PATCH 08/22] qmake.pro: Allow building a separate qmake for the
5 5 target
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7 6
8Upstream-Status: Inappropriate [config] 7Upstream-Status: Inappropriate [config]
8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9--- 11---
10 qmake/qmake.pro | 1 + 12 qmake/qmake.pro | 1 +
11 1 files changed, 1 insertions(+), 0 deletions(-) 13 1 file changed, 1 insertion(+)
12 14
13diff --git a/qmake/qmake.pro b/qmake/qmake.pro 15diff --git a/qmake/qmake.pro b/qmake/qmake.pro
14index b602afa..b59f7fb 100644 16index 38e0fce..53b1ffb 100644
15--- a/qmake/qmake.pro 17--- a/qmake/qmake.pro
16+++ b/qmake/qmake.pro 18+++ b/qmake/qmake.pro
17@@ -7,6 +7,7 @@ CONFIG += console bootstrap 19@@ -7,6 +7,7 @@ CONFIG += console bootstrap
@@ -23,5 +25,5 @@ index b602afa..b59f7fb 100644
23 OBJECTS_DIR = . 25 OBJECTS_DIR = .
24 MOC_DIR = . 26 MOC_DIR = .
25-- 27--
261.7.5.4 281.7.12
27 29
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch
index 82bff04974..43072e0938 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0009-qmake-fix-source-file-references-in-qmake.pri.patch
@@ -1,7 +1,7 @@
1From c56ed5f64a5f47cf8d539aa4ca9bedbe1fea2264 Mon Sep 17 00:00:00 2001 1From e863f35a80b130d8b520cdb7c81112a601157c44 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Fri, 10 Feb 2012 15:32:12 +0000 3Date: Wed, 26 Sep 2012 20:33:49 +0200
4Subject: [PATCH] qmake: fix source file references in qmake.pri 4Subject: [PATCH 09/22] qmake: fix source file references in qmake.pri
5 5
6Fix duplicate entries in SOURCES and HEADERS, and fix the source file 6Fix duplicate entries in SOURCES and HEADERS, and fix the source file
7list for the split of qlocale.cpp. 7list for the split of qlocale.cpp.
@@ -9,9 +9,10 @@ list for the split of qlocale.cpp.
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12--- 13---
13 qmake/qmake.pri | 8 ++++---- 14 qmake/qmake.pri | 8 ++++----
14 1 files changed, 4 insertions(+), 4 deletions(-) 15 1 file changed, 4 insertions(+), 4 deletions(-)
15 16
16diff --git a/qmake/qmake.pri b/qmake/qmake.pri 17diff --git a/qmake/qmake.pri b/qmake/qmake.pri
17index f2a3705..2d4e94c 100644 18index f2a3705..2d4e94c 100644
@@ -47,5 +48,5 @@ index f2a3705..2d4e94c 100644
47 qmap.cpp \ 48 qmap.cpp \
48 qmetatype.cpp \ 49 qmetatype.cpp \
49-- 50--
501.7.5.4 511.7.12
51 52
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
index 39c5f4a32c..38e3cdf60d 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
@@ -1,4 +1,8 @@
1Hack to not use the pg_config of the host system which will add /usr/include 1From 64c70ae60b96c940805ab50be3ce724df094eddc Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 20:36:38 +0200
4Subject: [PATCH 10/22] configure: Hack to not use the pg_config of the host
5 system which will add /usr/include
2 6
3pg_config is a native binary so using that when cross compiling 7pg_config is a native binary so using that when cross compiling
4will always fail. The commented out fix would do, but for OE 8will always fail. The commented out fix would do, but for OE
@@ -7,14 +11,18 @@ really cross compiling. Just comment out the test, we are passing
7the location to the postgres headers and if they are okay we 11the location to the postgres headers and if they are okay we
8will pad. 12will pad.
9 13
10Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
11Upstream-Status: Inappropriate [configuration] 14Upstream-Status: Inappropriate [configuration]
12 15
13Index: qt-everywhere-opensource-src-4.7.0/configure 16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14=================================================================== 17---
15--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 18 configure | 8 ++++----
16+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400 19 1 file changed, 4 insertions(+), 4 deletions(-)
17@@ -4921,10 +4921,10 @@ 20
21diff --git a/configure b/configure
22index 0231b7d..9650199f6 100755
23--- a/configure
24+++ b/configure
25@@ -5362,10 +5362,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
18 psql) 26 psql)
19 if [ "$CFG_SQL_psql" != "no" ]; then 27 if [ "$CFG_SQL_psql" != "no" ]; then
20 # Be careful not to use native pg_config when cross building. 28 # Be careful not to use native pg_config when cross building.
@@ -29,3 +37,6 @@ Index: qt-everywhere-opensource-src-4.7.0/configure
29 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" 37 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
30 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" 38 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
31 # But, respect PSQL_LIBS if set 39 # But, respect PSQL_LIBS if set
40--
411.7.12
42
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch
index effc5f14d0..7f6ff32289 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0011-freetype-host-includes.patch
@@ -1,21 +1,22 @@
1From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001 1From 9b05106d0bdfa84e8406633d71206ef1defaade8 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net> 2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 4 Jun 2007 14:48:50 +0200 3Date: Mon, 4 Jun 2007 14:48:50 +0200
4Subject: [PATCH] freetype host includes 4Subject: [PATCH 11/22] freetype host includes
5 5
6Host include path should not be used in cross compiling case. 6Host include path should not be used in cross compiling case.
7 7
8Ported from OE by: Yu Ke <ke.yu@intel.com> 8Ported from OE by: Yu Ke <ke.yu@intel.com>
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11--- 12---
12 config.tests/unix/freetype/freetype.pri | 2 +- 13 config.tests/unix/freetype/freetype.pri | 2 +-
13 1 files changed, 1 insertions(+), 1 deletions(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
14 15
15Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri 16diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
16=================================================================== 17index 7ef1cf9..b362fcd 100644
17--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri 2009-02-25 22:32:32.000000000 +0100 18--- a/config.tests/unix/freetype/freetype.pri
18+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri 2009-03-26 17:14:16.000000000 +0100 19+++ b/config.tests/unix/freetype/freetype.pri
19@@ -1,5 +1,5 @@ 20@@ -1,5 +1,5 @@
20 !cross_compile { 21 !cross_compile {
21- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH 22- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
@@ -23,3 +24,6 @@ Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetyp
23 # LSB doesn't allow using headers from /include or /usr/include 24 # LSB doesn't allow using headers from /include or /usr/include
24 linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH 25 linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
25 for(p, TRY_INCLUDEPATHS) { 26 for(p, TRY_INCLUDEPATHS) {
27--
281.7.12
29
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0009-support-2bpp.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0012-Add-2bpp-support.patch
index 6f0890bb54..580ba4c8f5 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0009-support-2bpp.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0012-Add-2bpp-support.patch
@@ -1,16 +1,25 @@
1Add 2bpp support 1From 69ff4de0f06ba112a5ca531957937dd860d0f3f8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
3Date: Wed, 26 Sep 2012 20:39:21 +0200
4Subject: [PATCH 12/22] Add 2bpp support
2 5
3Submitted upstream but rejected as being "out of scope": 6Submitted upstream but rejected as being "out of scope":
4http://bugreports.qt.nokia.com/browse/QTBUG-3468 7http://bugreports.qt.nokia.com/browse/QTBUG-3468
5 8
6Upstream-Status: Denied 9Upstream-Status: Denied
7Original author: Jeremy Lainé <jeremy.laine@m4x.org>
8Ported from OE by: Yu Ke <ke.yu@intel.com>
9 10
10diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linux-opensource-src-4.4.3/configure 11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2008-09-27 11:01:23.000000000 +0200 12---
12+++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-01-14 14:30:53.000000000 +0100 13 configure | 5 +-
13@@ -5045,6 +5045,7 @@ 14 src/gui/embedded/qscreen_qws.cpp | 211 ++++++++++++++++++++++++++++++++
15 src/gui/embedded/qscreenlinuxfb_qws.cpp | 4 +-
16 3 files changed, 216 insertions(+), 4 deletions(-)
17
18diff --git a/configure b/configure
19index 9650199f6..7028ecf 100755
20--- a/configure
21+++ b/configure
22@@ -6917,6 +6917,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
14 echo "Choose pixel-depths to support:" 23 echo "Choose pixel-depths to support:"
15 echo 24 echo
16 echo " 1. 1bpp, black/white" 25 echo " 1. 1bpp, black/white"
@@ -18,7 +27,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linu
18 echo " 4. 4bpp, grayscale" 27 echo " 4. 4bpp, grayscale"
19 echo " 8. 8bpp, paletted" 28 echo " 8. 8bpp, paletted"
20 echo " 12. 12bpp, rgb 4-4-4" 29 echo " 12. 12bpp, rgb 4-4-4"
21@@ -5063,11 +5064,11 @@ 30@@ -6935,11 +6936,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
22 fi 31 fi
23 if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then 32 if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
24 if [ "$CFG_QWS_DEPTHS" = "all" ]; then 33 if [ "$CFG_QWS_DEPTHS" = "all" ]; then
@@ -32,24 +41,11 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linu
32 generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";; 41 generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";;
33 esac 42 esac
34 done 43 done
35diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreenlinuxfb_qws.cpp qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreenlinuxfb_qws.cpp 44diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
36--- qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreenlinuxfb_qws.cpp 2008-09-27 11:01:28.000000000 +0200 45index d6c614d..504f3d3 100644
37+++ qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreenlinuxfb_qws.cpp 2009-01-14 17:22:34.000000000 +0100 46--- a/src/gui/embedded/qscreen_qws.cpp
38@@ -404,8 +404,8 @@ 47+++ b/src/gui/embedded/qscreen_qws.cpp
39 setupOffScreen(); 48@@ -469,6 +469,58 @@ static void solidFill_gray4(QScreen *screen, const QColor &color,
40
41 // Now read in palette
42- if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4)) {
43- screencols= (vinfo.bits_per_pixel==8) ? 256 : 16;
44+ if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4) || (vinfo.bits_per_pixel==2)) {
45+ screencols= 1 << vinfo.bits_per_pixel;
46 int loopc;
47 fb_cmap startcmap;
48 startcmap.start=0;
49diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_qws.cpp qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreen_qws.cpp
50--- qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_qws.cpp 2008-09-27 11:01:28.000000000 +0200
51+++ qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreen_qws.cpp 2009-01-14 17:22:44.000000000 +0100
52@@ -444,6 +444,58 @@
53 } 49 }
54 #endif // QT_QWS_DEPTH_4 50 #endif // QT_QWS_DEPTH_4
55 51
@@ -108,7 +104,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
108 #ifdef QT_QWS_DEPTH_1 104 #ifdef QT_QWS_DEPTH_1
109 static inline void qt_rectfill_mono(quint8 *dest, quint8 value, 105 static inline void qt_rectfill_mono(quint8 *dest, quint8 value,
110 int x, int y, int width, int height, 106 int x, int y, int width, int height,
111@@ -551,6 +603,11 @@ 107@@ -576,6 +628,11 @@ void qt_solidFill_setup(QScreen *screen, const QColor &color,
112 screen->d_ptr->solidFill = solidFill_gray4; 108 screen->d_ptr->solidFill = solidFill_gray4;
113 break; 109 break;
114 #endif 110 #endif
@@ -120,7 +116,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
120 #ifdef QT_QWS_DEPTH_1 116 #ifdef QT_QWS_DEPTH_1
121 case 1: 117 case 1:
122 screen->d_ptr->solidFill = solidFill_mono; 118 screen->d_ptr->solidFill = solidFill_mono;
123@@ -958,6 +1015,149 @@ 119@@ -1006,6 +1063,149 @@ static void blit_4(QScreen *screen, const QImage &image,
124 } 120 }
125 #endif // QT_QWS_DEPTH_4 121 #endif // QT_QWS_DEPTH_4
126 122
@@ -270,7 +266,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
270 #ifdef QT_QWS_DEPTH_1 266 #ifdef QT_QWS_DEPTH_1
271 267
272 struct qmono { quint8 dummy; } Q_PACKED; 268 struct qmono { quint8 dummy; } Q_PACKED;
273@@ -1206,6 +1406,11 @@ 269@@ -1259,6 +1459,11 @@ void qt_blit_setup(QScreen *screen, const QImage &image,
274 screen->d_ptr->blit = blit_4; 270 screen->d_ptr->blit = blit_4;
275 break; 271 break;
276 #endif 272 #endif
@@ -282,7 +278,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
282 #ifdef QT_QWS_DEPTH_1 278 #ifdef QT_QWS_DEPTH_1
283 case 1: 279 case 1:
284 screen->d_ptr->blit = blit_1; 280 screen->d_ptr->blit = blit_1;
285@@ -2056,6 +2261,8 @@ 281@@ -2146,6 +2351,8 @@ int QScreen::alloc(unsigned int r,unsigned int g,unsigned int b)
286 } 282 }
287 } else if (d == 4) { 283 } else if (d == 4) {
288 ret = qGray(r, g, b) >> 4; 284 ret = qGray(r, g, b) >> 4;
@@ -291,7 +287,7 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
291 } else if (d == 1) { 287 } else if (d == 1) {
292 ret = qGray(r, g, b) >= 128; 288 ret = qGray(r, g, b) >= 128;
293 } else { 289 } else {
294@@ -2126,6 +2333,10 @@ 290@@ -2216,6 +2423,10 @@ bool QScreen::supportsDepth(int d) const
295 } else if(d==1) { 291 } else if(d==1) {
296 return true; 292 return true;
297 #endif 293 #endif
@@ -302,3 +298,21 @@ diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_q
302 #ifdef QT_QWS_DEPTH_4 298 #ifdef QT_QWS_DEPTH_4
303 } else if(d==4) { 299 } else if(d==4) {
304 return true; 300 return true;
301diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp
302index 3fe9713..933f489 100644
303--- a/src/gui/embedded/qscreenlinuxfb_qws.cpp
304+++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp
305@@ -466,8 +466,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec)
306 setupOffScreen();
307
308 // Now read in palette
309- if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4)) {
310- screencols= (vinfo.bits_per_pixel==8) ? 256 : 16;
311+ if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4) || (vinfo.bits_per_pixel==2)) {
312+ screencols= 1 << vinfo.bits_per_pixel;
313 int loopc;
314 ::fb_cmap startcmap;
315 startcmap.start=0;
316--
3171.7.12
318
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0013-configure-add-crossarch-option.patch
index f302c5bd61..c1ec3b56cc 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0013-configure-add-crossarch-option.patch
@@ -1,20 +1,20 @@
1From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 1From 8ddc1820a8678fda3a9bf3da4fc256c22fbd9b51 Mon Sep 17 00:00:00 2001
2From: Matthias GĂ¼nther <matgnt@gmail.com> 2From: Michael Lauer <mickey@vanille-media.de>
3Date: Wed, 12 May 2010 16:52:45 +0200 3Date: Wed, 26 Sep 2012 20:41:32 +0200
4Subject: [PATCH 1/9] Added Openembedded "-crossarch" option 4Subject: [PATCH 13/22] configure: add "-crossarch" option
5 5
6Original Author: Michael Lauer <mickey@vanille-media.de>
7Upstream-Status: Pending 6Upstream-Status: Pending
8 7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9--- 9---
10 configure | 7 ++++++- 10 configure | 7 ++++++-
11 1 files changed, 6 insertions(+), 1 deletions(-) 11 1 file changed, 6 insertions(+), 1 deletion(-)
12 12
13diff --git a/configure b/configure 13diff --git a/configure b/configure
14index facd192..9d15136 100755 14index 7028ecf..8eb138f 100755
15--- a/configure 15--- a/configure
16+++ b/configure 16+++ b/configure
17@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do 17@@ -1059,7 +1059,7 @@ while [ "$#" -gt 0 ]; do
18 shift 18 shift
19 VAL=$1 19 VAL=$1
20 ;; 20 ;;
@@ -23,9 +23,9 @@ index facd192..9d15136 100755
23 VAR=`echo $1 | sed "s,^-\(.*\),\1,"` 23 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
24 shift 24 shift
25 VAL="$1" 25 VAL="$1"
26@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do 26@@ -1601,6 +1601,9 @@ while [ "$#" -gt 0 ]; do
27 xplatform) 27 case "$XPLATFORM" in *symbian*) XPLATFORM_SYMBIAN=yes;; esac
28 XPLATFORM="$VAL" 28 case "$XPLATFORM" in symbian-sbsv2) XPLATFORM_SYMBIAN_SBSV2=yes;; esac
29 ;; 29 ;;
30+ crossarch) 30+ crossarch)
31+ CROSSARCH="$VAL" 31+ CROSSARCH="$VAL"
@@ -33,9 +33,9 @@ index facd192..9d15136 100755
33 debug-and-release) 33 debug-and-release)
34 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 34 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
35 CFG_DEBUG_RELEASE="$VAL" 35 CFG_DEBUG_RELEASE="$VAL"
36@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then 36@@ -3200,6 +3203,8 @@ arm*)
37 CFG_ARCH=$CFG_HOST_ARCH 37 ;;
38 fi 38 esac
39 39
40+CFG_ARCH="$CROSSARCH" 40+CFG_ARCH="$CROSSARCH"
41+ 41+
@@ -43,5 +43,5 @@ index facd192..9d15136 100755
43 if [ "$OPT_VERBOSE" = "yes" ]; then 43 if [ "$OPT_VERBOSE" = "yes" ]; then
44 echo " '$CFG_ARCH' is supported" 44 echo " '$CFG_ARCH' is supported"
45-- 45--
461.7.0.4 461.7.12
47 47
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch
index 906d4e312f..b788a68ece 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch
@@ -1,4 +1,7 @@
1fix phony translation linking error 1From 306e0987cfdc67db11abc7071c48b0d196e84c8e Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 26 Sep 2012 20:45:10 +0200
4Subject: [PATCH 14/22] translations: fix phony translation linking error
2 5
3 | .../usr/lib/crt1.o: In function `_start': 6 | .../usr/lib/crt1.o: In function `_start':
4 | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' 7 | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
@@ -6,13 +9,16 @@ fix phony translation linking error
6 9
7Upstream-Status: Pending 10Upstream-Status: Pending
8 11
9Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 translations/translations.pro | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
10 16
11diff --git a/translations/translations.pro b/translations/translations.pro 17diff --git a/translations/translations.pro b/translations/translations.pro
12index cdaf04a..24fa668 100644 18index dc99beb..0d98829 100644
13--- a/translations/translations.pro 19--- a/translations/translations.pro
14+++ b/translations/translations.pro 20+++ b/translations/translations.pro
15@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} 21@@ -101,7 +101,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
16 updateqm.CONFIG += no_link 22 updateqm.CONFIG += no_link
17 QMAKE_EXTRA_COMPILERS += updateqm 23 QMAKE_EXTRA_COMPILERS += updateqm
18 24
@@ -21,7 +27,7 @@ index cdaf04a..24fa668 100644
21 QMAKE_LINK = @: IGNORE THIS LINE 27 QMAKE_LINK = @: IGNORE THIS LINE
22 OBJECTS_DIR = 28 OBJECTS_DIR =
23 win32:CONFIG -= embed_manifest_exe 29 win32:CONFIG -= embed_manifest_exe
24@@ -30,7 +30,7 @@ isEmpty(vcproj) { 30@@ -111,7 +111,7 @@ isEmpty(vcproj) {
25 phony_src.input = PHONY_DEPS 31 phony_src.input = PHONY_DEPS
26 phony_src.output = phony.c 32 phony_src.output = phony.c
27 phony_src.variable_out = GENERATED_SOURCES 33 phony_src.variable_out = GENERATED_SOURCES
@@ -30,3 +36,6 @@ index cdaf04a..24fa668 100644
30 phony_src.name = CREATE phony.c 36 phony_src.name = CREATE phony.c
31 phony_src.CONFIG += combine 37 phony_src.CONFIG += combine
32 QMAKE_EXTRA_COMPILERS += phony_src 38 QMAKE_EXTRA_COMPILERS += phony_src
39--
401.7.12
41
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/add_nostrip_for_debug_packages.diff b/meta/recipes-qt/qt4/qt4-4.8.1/0015-configure-add-nostrip-for-debug-packages.patch
index 774cb997a4..027633d276 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/add_nostrip_for_debug_packages.diff
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0015-configure-add-nostrip-for-debug-packages.patch
@@ -1,4 +1,7 @@
1author: Fathi Boudra <fabo@debian.org> 1From c7ee6896f4894626986956cc8892a13fa9f7c2aa Mon Sep 17 00:00:00 2001
2From: Fathi Boudra <fabo@debian.org>
3Date: Wed, 26 Sep 2012 20:46:14 +0200
4Subject: [PATCH 15/22] configure: add nostrip for debug packages
2 5
3Qt is built in release mode and strip files by default. 6Qt is built in release mode and strip files by default.
4Set CONFIG+=nostrip to avoid the stripping and 7Set CONFIG+=nostrip to avoid the stripping and
@@ -6,13 +9,16 @@ let dh_strip do it to generate debug packages.
6 9
7Upstream-Status: Inappropriate [Configuration] 10Upstream-Status: Inappropriate [Configuration]
8 11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9--- 13---
10 configure | 2 ++ 14 configure | 2 ++
11 1 file changed, 2 insertions(+) 15 1 file changed, 2 insertions(+)
12 16
17diff --git a/configure b/configure
18index 8eb138f..5cc755e 100755
13--- a/configure 19--- a/configure
14+++ b/configure 20+++ b/configure
15@@ -627,6 +627,8 @@ mkdir -p "$outpath/config.tests" 21@@ -631,6 +631,8 @@ mkdir -p "$outpath/config.tests"
16 rm -f "$outpath/config.tests/.qmake.cache" 22 rm -f "$outpath/config.tests/.qmake.cache"
17 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" 23 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
18 24
@@ -21,3 +27,6 @@ Upstream-Status: Inappropriate [Configuration]
21 QMakeVar add styles "cde mac motif plastique cleanlooks windows" 27 QMakeVar add styles "cde mac motif plastique cleanlooks windows"
22 QMakeVar add decorations "default windows styled" 28 QMakeVar add decorations "default windows styled"
23 QMakeVar add mouse-drivers "pc" 29 QMakeVar add mouse-drivers "pc"
30--
311.7.12
32
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch
index d5eac6b167..8b9b3bf911 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch
@@ -1,16 +1,25 @@
1From 3893ad264f85e4a0eec64017d515dddf9ee9ef88 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:47:08 +0200
4Subject: [PATCH 16/22] configure: eval QMAKE_CXX
5
1Allow expansion of $(...) references in QMAKE_CXX (currently its value 6Allow expansion of $(...) references in QMAKE_CXX (currently its value
2is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed 7is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
3which allows WebKit to be enabled. 8which allows WebKit to be enabled.
4 9
5Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
6
7Upstream-Status: Pending 10Upstream-Status: Pending
8 11
9Index: qt-everywhere-opensource-src-4.8.0/configure 12Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10=================================================================== 13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11--- qt-everywhere-opensource-src-4.8.0.orig/configure 14---
12+++ qt-everywhere-opensource-src-4.8.0/configure 15 configure | 3 ++-
13@@ -3322,7 +3322,8 @@ else 16 1 file changed, 2 insertions(+), 1 deletion(-)
17
18diff --git a/configure b/configure
19index 5cc755e..1e6c910 100755
20--- a/configure
21+++ b/configure
22@@ -3329,7 +3329,8 @@ else
14 CFG_FRAMEWORK=no 23 CFG_FRAMEWORK=no
15 fi 24 fi
16 25
@@ -20,3 +29,6 @@ Index: qt-everywhere-opensource-src-4.8.0/configure
20 TEST_COMPILER="$CXX" 29 TEST_COMPILER="$CXX"
21 30
22 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER 31 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
32--
331.7.12
34
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
index d455d0acfe..32649b4bf6 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
@@ -1,13 +1,19 @@
1Ensure we identify the compiler as g++ in configure 1From 965068125d1e83699442fca83f0c9fe05ecee564 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:48:37 +0200
4Subject: [PATCH 17/22] configure: ensure we identify the compiler as g++ in
5 configure
2 6
3Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure 7Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
4script was interpreting from this that the compiler was "oe-g++" and thus 8script was interpreting from this that the compiler was "oe-g++" and
9thus
5g++ specific checks were not being run since this string did not match; 10g++ specific checks were not being run since this string did not match;
6among other things this resulted in a compiler version check in the 11among other things this resulted in a compiler version check in the
7QtWebKit build code not working, and hence the following error at build 12QtWebKit build code not working, and hence the following error at build
8time: 13time:
9 14
10./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat] 15./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword
16in C++0x [-Werror=c++0x-compat]
11 17
12The easiest thing since our PLATFORM is entirely artificial is to just 18The easiest thing since our PLATFORM is entirely artificial is to just
13force COMPILER to "g++" in the configure script if it is detected as 19force COMPILER to "g++" in the configure script if it is detected as
@@ -16,10 +22,16 @@ force COMPILER to "g++" in the configure script if it is detected as
16Upstream-Status: Inappropriate [configuration] 22Upstream-Status: Inappropriate [configuration]
17 23
18Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 24Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
25Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
26---
27 configure | 3 +++
28 1 file changed, 3 insertions(+)
19 29
20--- qt-everywhere-opensource-src-4.8.0.orig/configure 30diff --git a/configure b/configure
21+++ qt-everywhere-opensource-src-4.8.0/configure 31index 1e6c910..0edaad9 100755
22@@ -7444,6 +7444,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; th 32--- a/configure
33+++ b/configure
34@@ -7444,6 +7444,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then
23 else 35 else
24 COMPILER=`echo $PLATFORM | cut -f 2- -d-` 36 COMPILER=`echo $PLATFORM | cut -f 2- -d-`
25 fi 37 fi
@@ -29,3 +41,6 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
29 if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then 41 if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
30 CFG_EXCEPTIONS=no 42 CFG_EXCEPTIONS=no
31 fi 43 fi
44--
451.7.12
46
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch
index 0992efaddc..4d915607e2 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch
@@ -1,7 +1,7 @@
1From 677f5b4bec03972c8cada19d2e4530252c9ac4ef Mon Sep 17 00:00:00 2001 1From d93ea994bf2ecee4775c68de645eac0cab248ac2 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 28 Feb 2012 15:10:24 +0000 3Date: Tue, 28 Feb 2012 15:10:24 +0000
4Subject: [PATCH] configure: make pulseaudio a configurable option 4Subject: [PATCH 18/22] configure: make pulseaudio a configurable option
5 5
6Allows disabling pulseaudio support within phonon at configure time. 6Allows disabling pulseaudio support within phonon at configure time.
7(This is the Qt 4.8.0 version.) 7(This is the Qt 4.8.0 version.)
@@ -9,15 +9,16 @@ Allows disabling pulseaudio support within phonon at configure time.
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12--- 13---
13 configure | 9 ++++++++- 14 configure | 9 ++++++++-
14 1 files changed, 8 insertions(+), 1 deletions(-) 15 1 file changed, 8 insertions(+), 1 deletion(-)
15 16
16diff --git a/configure b/configure 17diff --git a/configure b/configure
17index 5a5ef1d..e43b920 100755 18index 0edaad9..3a63734 100755
18--- a/configure 19--- a/configure
19+++ b/configure 20+++ b/configure
20@@ -1043,7 +1043,7 @@ while [ "$#" -gt 0 ]; do 21@@ -1045,7 +1045,7 @@ while [ "$#" -gt 0 ]; do
21 VAL=no 22 VAL=no
22 ;; 23 ;;
23 #Qt style yes options 24 #Qt style yes options
@@ -26,7 +27,7 @@ index 5a5ef1d..e43b920 100755
26 VAR=`echo $1 | sed "s,^-\(.*\),\1,"` 27 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
27 VAL=yes 28 VAL=yes
28 ;; 29 ;;
29@@ -2000,6 +2000,13 @@ while [ "$#" -gt 0 ]; do 30@@ -2005,6 +2005,13 @@ while [ "$#" -gt 0 ]; do
30 UNKNOWN_OPT=yes 31 UNKNOWN_OPT=yes
31 fi 32 fi
32 ;; 33 ;;
@@ -41,5 +42,5 @@ index 5a5ef1d..e43b920 100755
41 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 42 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
42 CFG_QGTKSTYLE="$VAL" 43 CFG_QGTKSTYLE="$VAL"
43-- 44--
441.7.5.4 451.7.12
45 46
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
new file mode 100644
index 0000000000..13229d47e3
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
@@ -0,0 +1,46 @@
1From 4811267206e20e5409df0500c02d7fe77caf5293 Mon Sep 17 00:00:00 2001
2From: Ken Werner <ken.werner@linaro.org>
3Date: Wed, 26 Sep 2012 20:53:35 +0200
4Subject: [PATCH 19/22] javascriptcore: Fix compile error when using
5 toolchains based on GCC 4.7.
6
7Upstream-Status: Pending
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | 4 +---
12 .../javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | 3 +--
13 2 files changed, 2 insertions(+), 5 deletions(-)
14
15diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
16index 7c20272..917c0ff 100644
17--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
18+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
19@@ -57,9 +57,7 @@ namespace JSC {
20
21 class JSGlobalObject : public JSVariableObject {
22 protected:
23- using JSVariableObject::JSVariableObjectData;
24-
25- struct JSGlobalObjectData : public JSVariableObjectData {
26+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
27 // We use an explicit destructor function pointer instead of a
28 // virtual destructor because we want to avoid adding a vtable
29 // pointer to this struct. Adding a vtable pointer would force the
30diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
31index 2542878..637f62c 100644
32--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
33+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
34@@ -32,8 +32,7 @@ namespace JSC{
35
36 class JSStaticScopeObject : public JSVariableObject {
37 protected:
38- using JSVariableObject::JSVariableObjectData;
39- struct JSStaticScopeObjectData : public JSVariableObjectData {
40+ struct JSStaticScopeObjectData : public JSVariableObjectData::JSVariableObjectData {
41 JSStaticScopeObjectData()
42 : JSVariableObjectData(&symbolTable, &registerStore + 1)
43 {
44--
451.7.12
46
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
new file mode 100644
index 0000000000..b763ac1c74
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0020-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
@@ -0,0 +1,63 @@
1From fb89f23c25363ac7b138fdba2bf5a9cdcaa7e840 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 26 Sep 2012 20:54:38 +0200
4Subject: [PATCH 20/22] Fixes for gcc 4.7.0, particularly on qemux86
5
6Origin: upstream, http://trac.webkit.org/changeset/93631
7Origin: upstream, http://trac.webkit.org/changeset/113848
8
9Bug: https://bugs.webkit.org/show_bug.cgi?id=62168
10Bug: https://bugs.webkit.org/show_bug.cgi?id=83584
11
12RP 2012/04/30
13
14Upstream-Status: Backport
15
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 src/3rdparty/webkit/Source/WebCore/dom/Element.cpp | 2 +-
19 src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp | 2 +-
20 .../webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h | 1 +
21 3 files changed, 3 insertions(+), 2 deletions(-)
22
23diff --git a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
24index 32e47ca..b8e7389 100644
25--- a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
26+++ b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
27@@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange change)
28 {
29 // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
30 RefPtr<RenderStyle> currentStyle(renderStyle());
31- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
32+ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false;
33 bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
34 bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
35
36diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
37index d66075e..ab8f111 100644
38--- a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
39+++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
40@@ -74,7 +74,7 @@ PassRefPtr<HTMLImageElement> HTMLImageElement::createForJSConstructor(Document*
41 RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
42 if (optionalWidth)
43 image->setWidth(*optionalWidth);
44- if (optionalHeight > 0)
45+ if (optionalHeight)
46 image->setHeight(*optionalHeight);
47 return image.release();
48 }
49diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
50index 6087ec3..6d748f6 100644
51--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
52+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
53@@ -25,6 +25,7 @@ namespace WebCore {
54 #if ENABLE(TILED_BACKING_STORE)
55 class TiledBackingStoreClient {
56 public:
57+ virtual ~TiledBackingStoreClient() { }
58 virtual void tiledBackingStorePaintBegin() = 0;
59 virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
60 virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0;
61--
621.7.12
63
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch
new file mode 100644
index 0000000000..05dc806864
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0021-webkit-disable-the-fuse-ld-gold-flag.patch
@@ -0,0 +1,41 @@
1From 3a74f5cf7f92ff6bf6b69c7cf76f54516573abb7 Mon Sep 17 00:00:00 2001
2From: Ken Werner <ken.werner@linaro.org>
3Date: Wed, 26 Sep 2012 20:55:21 +0200
4Subject: [PATCH 21/22] webkit: disable the -fuse-ld=gold flag
5
6This option is a Debian/Ubuntu specific extension to the g++ and causes upstream GCC to throw an error.
7
8Upstream-Status: Pending
9
10Signed-off-by: Ken Werner <ken.werner@linaro.org>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 src/3rdparty/webkit/Source/common.pri | 12 ++++++------
14 1 file changed, 6 insertions(+), 6 deletions(-)
15
16diff --git a/src/3rdparty/webkit/Source/common.pri b/src/3rdparty/webkit/Source/common.pri
17index 0f62e14..d81a1f0 100644
18--- a/src/3rdparty/webkit/Source/common.pri
19+++ b/src/3rdparty/webkit/Source/common.pri
20@@ -3,12 +3,12 @@
21 contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
22 contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
23
24-linux-g++ {
25-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
26- message(Using gold linker)
27- QMAKE_LFLAGS+=-fuse-ld=gold
28-}
29-}
30+#linux-g++ {
31+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
32+# message(Using gold linker)
33+# QMAKE_LFLAGS+=-fuse-ld=gold
34+#}
35+#}
36
37 # We use this flag on production branches
38 # See https://bugs.webkit.org/show_bug.cgi?id=60824
39--
401.7.12
41
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch
new file mode 100644
index 0000000000..bdd5d4fc84
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch
@@ -0,0 +1,39 @@
1From 5cc08e33ea7ab5d32b6a14ccb23a366d56e50ea1 Mon Sep 17 00:00:00 2001
2From: Nitin A Kamble <nitin.a.kamble@intel.com>
3Date: Wed, 26 Sep 2012 20:56:33 +0200
4Subject: [PATCH 22/22] webkit: fix conflicting types
5
6This patch fixes the type mismatch fixing this compile issue:
7
8|
9/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7:
10error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
11| In file included from ./wtf/Platform.h:1217:0,
12| from ./config.h:30,
13| from wtf/gobject/GOwnPtr.cpp:19:
14| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously
15declared here
16
17Upstream-Status: Pending
18
19Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20---
21 src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
25index c7f7ac4..f00e9cf 100644
26--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
27+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
28@@ -52,7 +52,7 @@ typedef struct _GFile GFile;
29 typedef struct _GHashTable GHashTable;
30 typedef struct _GInputStream GInputStream;
31 typedef struct _GList GList;
32-typedef struct _GMutex GMutex;
33+typedef union _GMutex GMutex;
34 typedef struct _GPatternSpec GPatternSpec;
35 typedef struct _GPollableOutputStream GPollableOutputStream;
36 typedef struct _GSocketClient GSocketClient;
37--
381.7.12
39
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch b/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
deleted file mode 100644
index d74f7fde1a..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1qt4-tools-native: set LFLAGS to pick up zlib from staging
2
3Original Author: Jeremy Lainé <jeremy.laine@m4x.org>
4Upstream-Status: Pending
5
6Index: qt-everywhere-opensource-src-4.8.0/configure
7===================================================================
8--- qt-everywhere-opensource-src-4.8.0.orig/configure
9+++ qt-everywhere-opensource-src-4.8.0/configure
10@@ -611,7 +611,7 @@ fi
11 # initalize variables
12 #-------------------------------------------------------------------------------
13
14-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
15+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
16 for varname in $SYSTEM_VARIABLES; do
17 qmakevarname="${varname}"
18 # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
deleted file mode 100644
index 6efbaf5d97..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Disable the -fuse-ld=gold flag. This option is a Debian/Ubuntu specific
2extension to the g++ and causes upstream GCC to throw an error.
3
4Upstream-Status: Pending
5
6Signed-off-by: Ken Werner <ken.werner@linaro.org>
7
8Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
9===================================================================
10--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/webkit/Source/common.pri
11+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
12@@ -3,12 +3,12 @@
13 contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
14 contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
15
16-linux-g++ {
17-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
18- message(Using gold linker)
19- QMAKE_LFLAGS+=-fuse-ld=gold
20-}
21-}
22+#linux-g++ {
23+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
24+# message(Using gold linker)
25+# QMAKE_LFLAGS+=-fuse-ld=gold
26+#}
27+#}
28
29 # We use this flag on production branches
30 # See https://bugs.webkit.org/show_bug.cgi?id=60824
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
deleted file mode 100644
index 81245059c0..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Pending
2
3This patch fixes the type mismatch fixing this compile issue:
4
5| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
6| In file included from ./wtf/Platform.h:1217:0,
7| from ./config.h:30,
8| from wtf/gobject/GOwnPtr.cpp:19:
9| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here
10NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed
11
12
13Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
142012/04/30
15
16
17Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
18===================================================================
19--- qt-everywhere-opensource-src-4.8.1/src/3rdparty.orig/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
20+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
21@@ -52,7 +52,7 @@ typedef struct _GFile GFile;
22 typedef struct _GHashTable GHashTable;
23 typedef struct _GInputStream GInputStream;
24 typedef struct _GList GList;
25-typedef struct _GMutex GMutex;
26+typedef union _GMutex GMutex;
27 typedef struct _GPatternSpec GPatternSpec;
28 typedef struct _GPollableOutputStream GPollableOutputStream;
29 typedef struct _GSocketClient GSocketClient;
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
deleted file mode 100644
index 47618cfde1..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Fix compile error when using toolchains based on GCC 4.7.
2
3Upstream-Status: Pending
4
5Signed-off-by: Ken Werner <ken.werner@linaro.org>
6
7Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
8===================================================================
9--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
10+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
11@@ -57,9 +57,7 @@ namespace JSC {
12
13 class JSGlobalObject : public JSVariableObject {
14 protected:
15- using JSVariableObject::JSVariableObjectData;
16-
17- struct JSGlobalObjectData : public JSVariableObjectData {
18+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
19 // We use an explicit destructor function pointer instead of a
20 // virtual destructor because we want to avoid adding a vtable
21 // pointer to this struct. Adding a vtable pointer would force the
22Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
23===================================================================
24--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
25+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
26@@ -32,8 +32,7 @@ namespace JSC{
27
28 class JSStaticScopeObject : public JSVariableObject {
29 protected:
30- using JSVariableObject::JSVariableObjectData;
31- struct JSStaticScopeObjectData : public JSVariableObjectData {
32+ struct JSStaticScopeObjectData : public JSVariableObjectData::JSVariableObjectData {
33 JSStaticScopeObjectData()
34 : JSVariableObjectData(&symbolTable, &registerStore + 1)
35 {
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
deleted file mode 100644
index 09513b6ae7..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1Fixes for gcc 4.7.0, particularly on qemux86
2
3Origin: upstream, http://trac.webkit.org/changeset/93631
4Origin: upstream, http://trac.webkit.org/changeset/113848
5
6Bug: https://bugs.webkit.org/show_bug.cgi?id=62168
7Bug: https://bugs.webkit.org/show_bug.cgi?id=83584
8
9RP 2012/04/30
10
11Upstream-Status: Backport
12
13Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
14===================================================================
15--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2012-04-30 09:15:17.000000000 +0000
16+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2012-04-30 09:22:04.586008994 +0000
17@@ -1080,7 +1080,7 @@
18 {
19 // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
20 RefPtr<RenderStyle> currentStyle(renderStyle());
21- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
22+ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false;
23 bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
24 bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
25
26Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
27===================================================================
28--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2012-03-14 14:01:19.000000000 +0000
29+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2012-04-30 09:22:04.586008994 +0000
30@@ -74,7 +74,7 @@
31 RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
32 if (optionalWidth)
33 image->setWidth(*optionalWidth);
34- if (optionalHeight > 0)
35+ if (optionalHeight)
36 image->setHeight(*optionalHeight);
37 return image.release();
38 }
39Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
40===================================================================
41--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h 2012-03-14 14:01:24.000000000 +0000
42+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h 2012-04-30 09:22:04.590008963 +0000
43@@ -25,6 +25,7 @@
44 #if ENABLE(TILED_BACKING_STORE)
45 class TiledBackingStoreClient {
46 public:
47+ virtual ~TiledBackingStoreClient() { }
48 virtual void tiledBackingStorePaintBegin() = 0;
49 virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
50 virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0;
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch
deleted file mode 100644
index 2ab05ed1ad..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Allow to set a qt.conf from the outside using the environment. This allows
2to inject new prefixes and other paths into qmake. This is needed when using
3the same qmake binary to build qt/x11 and qt/embedded
4
5Original Author: Holger Freyther <zecke@selfish.org>
6Ported from OE by: Yu Ke <ke.yu@intel.com>
7Upstream-Status: Pending
8
9--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200
10+++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200
11@@ -47,6 +47,7 @@
12 QT_BEGIN_NAMESPACE
13 extern QString qmake_libraryInfoFile();
14 QT_END_NAMESPACE
15+#include <stdlib.h>
16 #else
17 # include "qcoreapplication.h"
18 #endif
19@@ -113,6 +114,10 @@
20 #ifdef QT_BUILD_QMAKE
21 if(!QFile::exists(qtconfig))
22 qtconfig = qmake_libraryInfoFile();
23+ if (!QFile::exists(qtconfig)) {
24+ QByteArray config = getenv("QT_CONF_PATH");
25+ qtconfig = QFile::decodeName(config);
26+ }
27 #else
28 if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
29 #ifdef Q_OS_MAC
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/set-OUTPUT_DIR-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.1/set-OUTPUT_DIR-if-empty.patch
deleted file mode 100644
index 9cb72baf9e..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/set-OUTPUT_DIR-if-empty.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
2now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
3
4First reported here:
5http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html
6
7Upstream-Status: Pending
8
9--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro.orig 2012-05-01 07:48:08.457613310 +0200
10+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro 2012-05-01 07:48:15.493613232 +0200
11@@ -3,6 +3,8 @@
12
13 CONFIG -= debug_and_release
14
15+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
16+
17 CONFIG(standalone_package) {
18 isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
19 isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated