summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.4
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-12-05 22:59:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-11 15:54:37 +0000
commit89230eaa76edf2477af3f9bc31efe904d80ab71e (patch)
treee559c839558d0f9d7037979c65de64e49d2f75aa /meta/recipes-qt/qt4/qt4-4.8.4
parent348897358736c28240c084affaca5b4e2fbe499a (diff)
downloadpoky-89230eaa76edf2477af3f9bc31efe904d80ab71e.tar.gz
qt4: upgrade to 4.8.4
* changes in licenses are only s/Nokia/Digia/ (From OE-Core rev: 5d898695ab3ce368a1d1f2066bb980ee829ae077) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.4')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch43
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch50
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch34
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch29
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch28
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch38
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch34
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch29
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch52
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch42
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch29
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch318
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch47
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch41
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch32
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch37
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch46
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch46
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch63
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch41
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch95
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/g++.conf56
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/linux.conf66
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/qte.sh7
24 files changed, 1303 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
new file mode 100644
index 0000000000..d8b0a09d17
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -0,0 +1,43 @@
1From 55097d27e8b746b3d5ff437939caf1fa43c0d62b 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/21] 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 180dc39..4adad35 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.8.0
43
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
new file mode 100644
index 0000000000..98fc88738f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
@@ -0,0 +1,50 @@
1From 5e6b1051afa3099a02a758b0596236759d70670e 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/21] qkbdtty_qws: fix build with old kernel headers
5
6This issue is that with C++ compiler process an old version of kernel
7header file, coincidently that file has a variable named 'new':
8
9* 'embedded/qkbdtty_qws.cpp' include 'linux/vt.h';
10* '/usr/include/linux/vt.h' has below code on SLED-11.x:
11 + unsigned int new;
12
13On mostly hosts it has been changed to: new -> newev.
14
15Upstream-Status: Pending
16
17Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
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
23diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
24index a46811b..762138f 100644
25--- a/src/gui/embedded/qkbdtty_qws.cpp
26+++ b/src/gui/embedded/qkbdtty_qws.cpp
27@@ -54,8 +54,20 @@
28
29 #if defined Q_OS_LINUX
30 # include <linux/kd.h>
31+
32+/* Workaround kernel headers using "new" as variable name. The problem
33+ is specific to SLED-11, other distros use "newev" rather than "new" */
34+#ifdef __cplusplus
35+#warning "workaround kernel headers using new as variable name on SLED 11"
36+#define new newev
37+#endif
38+
39 # include <linux/vt.h> //TODO: move vt handling somewhere else (QLinuxFbScreen?)
40
41+#ifdef __cplusplus
42+#undef new
43+#endif
44+
45 # include "qscreen_qws.h"
46 # include "qwindowsystem_qws.h"
47 # include "qapplication.h"
48--
491.8.0
50
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
new file mode 100644
index 0000000000..ecaea51e08
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
@@ -0,0 +1,34 @@
1From b6805e883c078f7647d9234aca4e3513ebd1c9bf 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/21] 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.8.0
34
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
new file mode 100644
index 0000000000..1eb8a5843a
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
@@ -0,0 +1,29 @@
1From af699c6e8cf9fb28d6f8b789bf33d53b47edaec7 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/21] 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 e3d464b..cc04b27 100755
16--- a/configure
17+++ b/configure
18@@ -4899,7 +4899,7 @@ setBootstrapVariable()
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.8.0
29
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
new file mode 100644
index 0000000000..1a8f2b7f94
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
@@ -0,0 +1,28 @@
1From ac93237bc90ea7773c0ef5275962baba01d4a9c7 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/21] 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 cc04b27..5a7c4ee 100755
15--- a/configure
16+++ b/configure
17@@ -690,7 +690,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.8.0
28
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
new file mode 100644
index 0000000000..90ebf75095
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
@@ -0,0 +1,38 @@
1From 0bc0db83812b5900dc4e6ffa96bdeab46b6adcae 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/21] configure: Use OE_QMAKE_* values to specify Qt utility
5 paths
6
7Upstream-Status: Inappropriate [configuration]
8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure | 10 +++++-----
13 1 file changed, 5 insertions(+), 5 deletions(-)
14
15diff --git a/configure b/configure
16index 5a7c4ee..db4d044 100755
17--- a/configure
18+++ b/configure
19@@ -8683,11 +8683,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
20 QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
21
22 #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
23-QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
24-QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
25-QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
26-QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
27-QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
28+QMAKE_MOC = \${OE_QMAKE_MOC}
29+QMAKE_UIC = \${OE_QMAKE_UIC}
30+QMAKE_UIC3 = \${OE_QMAKE_UIC3}
31+QMAKE_RCC = \${OE_QMAKE_RCC}
32+QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP}
33 QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
34 QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
35
36--
371.8.0
38
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
new file mode 100644
index 0000000000..7d3b336f77
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
@@ -0,0 +1,34 @@
1From 2011bb8029480af1d1266f258e5a5f5cef7392d3 Mon Sep 17 00:00:00 2001
2From: Pavel Heimlich <tropikhajma@gmail.com>
3Date: Wed, 26 Sep 2012 20:31:10 +0200
4Subject: [PATCH 07/21] dbus: Remove "const" usage that causes compile failure
5 building nativesdk-qt4-tools
6
7Patch has apparently been rejected upstream, not because it is invalid
8but because the submitter did not submit a merge request for it, so the
9validity of the patch upstream is uncertain. For further details see:
10http://bugreports.qt.nokia.com/browse/QTBUG-17962
11
12Upstream-Status: Denied [possible retry]
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
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 0f0b647..aa4cbab 100644
21--- a/src/dbus/qdbusintegrator.cpp
22+++ b/src/dbus/qdbusintegrator.cpp
23@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
24 static bool isDebugging;
25 #define qDBusDebug if (!::isDebugging); else qDebug
26
27-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
28+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
29
30 static inline QString dbusServiceString()
31 { return *orgFreedesktopDBusString(); }
32--
331.8.0
34
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
new file mode 100644
index 0000000000..ec07f41403
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
@@ -0,0 +1,29 @@
1From 64ce5d0e7c19436b928a2a0d9d192f56be3c9bb2 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:32:41 +0200
4Subject: [PATCH 08/21] qmake.pro: Allow building a separate qmake for the
5 target
6
7Upstream-Status: Inappropriate [config]
8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.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 38e0fce..53b1ffb 100644
17--- a/qmake/qmake.pro
18+++ b/qmake/qmake.pro
19@@ -7,6 +7,7 @@ CONFIG += console bootstrap
20 CONFIG -= qt shared app_bundle uic
21 DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED
22 DESTDIR = ../bin/
23+TARGET = qmake2
24
25 OBJECTS_DIR = .
26 MOC_DIR = .
27--
281.8.0
29
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch
new file mode 100644
index 0000000000..45b8c10fbe
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch
@@ -0,0 +1,52 @@
1From e129dc0d6cde69dd15d1836c4111e0526fc29161 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:33:49 +0200
4Subject: [PATCH 09/21] qmake: fix source file references in qmake.pri
5
6Fix duplicate entries in SOURCES and HEADERS, and fix the source file
7list for the split of qlocale.cpp.
8
9Upstream-Status: Pending
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 qmake/qmake.pri | 8 ++++----
15 1 file changed, 4 insertions(+), 4 deletions(-)
16
17diff --git a/qmake/qmake.pri b/qmake/qmake.pri
18index 31f67f4..9081669 100644
19--- a/qmake/qmake.pri
20+++ b/qmake/qmake.pri
21@@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
22 generators/symbian/initprojectdeploy_symbian.cpp \
23 generators/integrity/gbuild.cpp \
24 windows/registry.cpp \
25- symbian/epocroot.cpp \
26- generators/integrity/gbuild.cpp
27+ symbian/epocroot.cpp
28
29 HEADERS += project.h property.h generators/makefile.h \
30 generators/unix/unixmake.h meta.h option.h cachekeys.h \
31@@ -40,8 +39,7 @@ HEADERS += project.h property.h generators/makefile.h \
32 generators/symbian/initprojectdeploy_symbian.h \
33 generators/integrity/gbuild.h \
34 windows/registry_p.h \
35- symbian/epocroot_p.h \
36- generators/integrity/gbuild.h
37+ symbian/epocroot_p.h
38
39 contains(QT_EDITION, OpenSource) {
40 DEFINES += QMAKE_OPENSOURCE_EDITION
41@@ -72,6 +70,8 @@ bootstrap { #Qt code
42 qlist.cpp \
43 qlinkedlist.cpp \
44 qlocale.cpp \
45+ qlocale_tools.cpp \
46+ qlocale_unix.cpp \
47 qmalloc.cpp \
48 qmap.cpp \
49 qmetatype.cpp \
50--
511.8.0
52
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
new file mode 100644
index 0000000000..1d2ddab490
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
@@ -0,0 +1,42 @@
1From 4888791d1899f781af710dd8813887dea52fda59 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/21] configure: Hack to not use the pg_config of the host
5 system which will add /usr/include
6
7pg_config is a native binary so using that when cross compiling
8will always fail. The commented out fix would do, but for OE
9our -platform and -xplatform is the same so we are actually not
10really cross compiling. Just comment out the test, we are passing
11the location to the postgres headers and if they are okay we
12will pad.
13
14Upstream-Status: Inappropriate [configuration]
15
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 configure | 8 ++++----
19 1 file changed, 4 insertions(+), 4 deletions(-)
20
21diff --git a/configure b/configure
22index db4d044..35a8fe7 100755
23--- a/configure
24+++ b/configure
25@@ -5511,10 +5511,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
26 psql)
27 if [ "$CFG_SQL_psql" != "no" ]; then
28 # Be careful not to use native pg_config when cross building.
29- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
30- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
31- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
32- fi
33+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
34+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
35+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
36+# fi
37 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
38 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
39 # But, respect PSQL_LIBS if set
40--
411.8.0
42
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch
new file mode 100644
index 0000000000..e0879c5615
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch
@@ -0,0 +1,29 @@
1From 3fcffa79e6a5f0448cbfe2bb33fe1218f5dae61d Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 4 Jun 2007 14:48:50 +0200
4Subject: [PATCH 11/21] freetype host includes
5
6Host include path should not be used in cross compiling case.
7
8Ported from OE by: Yu Ke <ke.yu@intel.com>
9Upstream-Status: Pending
10
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 config.tests/unix/freetype/freetype.pri | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
17index 7ef1cf9..b362fcd 100644
18--- a/config.tests/unix/freetype/freetype.pri
19+++ b/config.tests/unix/freetype/freetype.pri
20@@ -1,5 +1,5 @@
21 !cross_compile {
22- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
23+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
24 # LSB doesn't allow using headers from /include or /usr/include
25 linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
26 for(p, TRY_INCLUDEPATHS) {
27--
281.8.0
29
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch
new file mode 100644
index 0000000000..8402eab635
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch
@@ -0,0 +1,318 @@
1From 8744273fc452eb54bbeeb7d15823009ce926c6fa 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/21] Add 2bpp support
5
6Submitted upstream but rejected as being "out of scope":
7http://bugreports.qt.nokia.com/browse/QTBUG-3468
8
9Upstream-Status: Denied
10
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 configure | 5 +-
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 35a8fe7..79c1c7b 100755
20--- a/configure
21+++ b/configure
22@@ -7063,6 +7063,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
23 echo "Choose pixel-depths to support:"
24 echo
25 echo " 1. 1bpp, black/white"
26+ echo " 2. 2bpp, grayscale"
27 echo " 4. 4bpp, grayscale"
28 echo " 8. 8bpp, paletted"
29 echo " 12. 12bpp, rgb 4-4-4"
30@@ -7081,11 +7082,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
31 fi
32 if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
33 if [ "$CFG_QWS_DEPTHS" = "all" ]; then
34- CFG_QWS_DEPTHS="1 4 8 12 15 16 18 24 32 generic"
35+ CFG_QWS_DEPTHS="1 2 4 8 12 15 16 18 24 32 generic"
36 fi
37 for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do
38 case $D in
39- 1|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
40+ 1|2|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
41 generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";;
42 esac
43 done
44diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
45index b307bf2..88950b3 100644
46--- a/src/gui/embedded/qscreen_qws.cpp
47+++ b/src/gui/embedded/qscreen_qws.cpp
48@@ -469,6 +469,58 @@ static void solidFill_gray4(QScreen *screen, const QColor &color,
49 }
50 #endif // QT_QWS_DEPTH_4
51
52+#ifdef QT_QWS_DEPTH_2
53+static inline void qt_rectfill_gray2(quint8 *dest, quint8 value,
54+ int x, int y, int width, int height,
55+ int stride)
56+{
57+ const int pixelsPerByte = 4;
58+ const int alignWidth = qMin(width, (4 - (x & 3)) & 3);
59+ const int doAlign = (alignWidth > 0 ? 1 : 0);
60+ const int alignStart = pixelsPerByte - 1 - (x & 3);
61+ const int alignStop = alignStart - (alignWidth - 1);
62+ const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop);
63+ const int tailWidth = (width - alignWidth) & 3;
64+ const int doTail = (tailWidth > 0 ? 1 : 0);
65+ const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1;
66+ const int width8 = (width - alignWidth) / pixelsPerByte;
67+
68+ dest += y * stride + x / pixelsPerByte;
69+ stride -= (doAlign + width8);
70+
71+ for (int j = 0; j < height; ++j) {
72+ if (doAlign) {
73+ *dest = (*dest & ~alignMask) | (value & alignMask);
74+ ++dest;
75+ }
76+ if (width8) {
77+ qt_memfill<quint8>(dest, value, width8);
78+ dest += width8;
79+ }
80+ if (doTail)
81+ *dest = (*dest & tailMask) | (value & ~tailMask);
82+ dest += stride;
83+ }
84+}
85+
86+static void solidFill_gray2(QScreen *screen, const QColor &color,
87+ const QRegion &region)
88+{
89+ quint8 *dest = reinterpret_cast<quint8*>(screen->base());
90+ const quint8 c = qGray(color.rgba()) >> 6;
91+ const quint8 c8 = (c << 6) | (c << 4) | (c << 2) | c;
92+
93+ const int stride = screen->linestep();
94+ const QVector<QRect> rects = region.rects();
95+
96+ for (int i = 0; i < rects.size(); ++i) {
97+ const QRect r = rects.at(i);
98+ qt_rectfill_gray2(dest, c8, r.x(), r.y(), r.width(), r.height(),
99+ stride);
100+ }
101+}
102+#endif // QT_QWS_DEPTH_2
103+
104 #ifdef QT_QWS_DEPTH_1
105 static inline void qt_rectfill_mono(quint8 *dest, quint8 value,
106 int x, int y, int width, int height,
107@@ -576,6 +628,11 @@ void qt_solidFill_setup(QScreen *screen, const QColor &color,
108 screen->d_ptr->solidFill = solidFill_gray4;
109 break;
110 #endif
111+#ifdef QT_QWS_DEPTH_2
112+ case 2:
113+ screen->d_ptr->solidFill = solidFill_gray2;
114+ break;
115+#endif
116 #ifdef QT_QWS_DEPTH_1
117 case 1:
118 screen->d_ptr->solidFill = solidFill_mono;
119@@ -1006,6 +1063,149 @@ static void blit_4(QScreen *screen, const QImage &image,
120 }
121 #endif // QT_QWS_DEPTH_4
122
123+#ifdef QT_QWS_DEPTH_2
124+
125+struct qgray2 { quint8 dummy; } Q_PACKED;
126+
127+template <typename SRC>
128+static inline quint8 qt_convertToGray2(SRC color);
129+
130+template <>
131+inline quint8 qt_convertToGray2(quint32 color)
132+{
133+ return qGray(color) >> 6;
134+}
135+
136+template <>
137+inline quint8 qt_convertToGray2(quint16 color)
138+{
139+ const int r = (color & 0xf800) >> 11;
140+ const int g = (color & 0x07e0) >> 6; // only keep 5 bit
141+ const int b = (color & 0x001f);
142+ return (r * 11 + g * 16 + b * 5) >> 8;
143+}
144+
145+template <>
146+inline quint8 qt_convertToGray2(qrgb444 color)
147+{
148+ return qt_convertToGray2(quint32(color));
149+}
150+
151+template <>
152+inline quint8 qt_convertToGray2(qargb4444 color)
153+{
154+ return qt_convertToGray2(quint32(color));
155+}
156+
157+template <typename SRC>
158+static inline void qt_rectconvert_gray2(qgray2 *dest2, const SRC *src,
159+ int x, int y, int width, int height,
160+ int dstStride, int srcStride)
161+{
162+ const int pixelsPerByte = 4;
163+ quint8 *dest8 = reinterpret_cast<quint8*>(dest2)
164+ + y * dstStride + x / pixelsPerByte;
165+ const int alignWidth = qMin(width, (4 - (x & 3)) & 3);
166+ const int doAlign = (alignWidth > 0 ? 1 : 0);
167+ const int alignStart = pixelsPerByte - 1 - (x & 3);
168+ const int alignStop = alignStart - (alignWidth - 1);
169+ const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop);
170+ const int tailWidth = (width - alignWidth) & 3;
171+ const int doTail = (tailWidth > 0 ? 1 : 0);
172+ const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1;
173+ const int width8 = (width - alignWidth) / pixelsPerByte;
174+
175+ srcStride = srcStride / sizeof(SRC) - (width8 * pixelsPerByte + alignWidth);
176+ dstStride -= (width8 + doAlign);
177+
178+ for (int j = 0; j < height; ++j) {
179+ if (doAlign) {
180+ quint8 d = *dest8 & ~alignMask;
181+ for (int i = alignStart; i >= alignStop; --i)
182+ d |= qt_convertToGray2<SRC>(*src++) << (2 * i);
183+ *dest8++ = d;
184+ }
185+ for (int i = 0; i < width8; ++i) {
186+ *dest8 = (qt_convertToGray2<SRC>(src[0]) << 6)
187+ | (qt_convertToGray2<SRC>(src[1]) << 4)
188+ | (qt_convertToGray2<SRC>(src[2]) << 2)
189+ | (qt_convertToGray2<SRC>(src[3]));
190+ src += 4;
191+ ++dest8;
192+ }
193+ if (doTail) {
194+ quint8 d = *dest8 & tailMask;
195+ switch (tailWidth) {
196+ case 3: d |= qt_convertToGray2<SRC>(src[2]) << 2;
197+ case 2: d |= qt_convertToGray2<SRC>(src[1]) << 4;
198+ case 1: d |= qt_convertToGray2<SRC>(src[0]) << 6;
199+ }
200+ *dest8 = d;
201+ }
202+
203+ dest8 += dstStride;
204+ src += srcStride;
205+ }
206+}
207+
208+template <>
209+void qt_rectconvert(qgray2 *dest, const quint32 *src,
210+ int x, int y, int width, int height,
211+ int dstStride, int srcStride)
212+{
213+ qt_rectconvert_gray2<quint32>(dest, src, x, y, width, height,
214+ dstStride, srcStride);
215+}
216+
217+template <>
218+void qt_rectconvert(qgray2 *dest, const quint16 *src,
219+ int x, int y, int width, int height,
220+ int dstStride, int srcStride)
221+{
222+ qt_rectconvert_gray2<quint16>(dest, src, x, y, width, height,
223+ dstStride, srcStride);
224+}
225+
226+template <>
227+void qt_rectconvert(qgray2 *dest, const qrgb444 *src,
228+ int x, int y, int width, int height,
229+ int dstStride, int srcStride)
230+{
231+ qt_rectconvert_gray2<qrgb444>(dest, src, x, y, width, height,
232+ dstStride, srcStride);
233+}
234+
235+template <>
236+void qt_rectconvert(qgray2 *dest, const qargb4444 *src,
237+ int x, int y, int width, int height,
238+ int dstStride, int srcStride)
239+{
240+ qt_rectconvert_gray2<qargb4444>(dest, src, x, y, width, height,
241+ dstStride, srcStride);
242+}
243+
244+static void blit_2(QScreen *screen, const QImage &image,
245+ const QPoint &topLeft, const QRegion &region)
246+{
247+ switch (image.format()) {
248+ case QImage::Format_ARGB32_Premultiplied:
249+ blit_template<qgray2, quint32>(screen, image, topLeft, region);
250+ return;
251+ case QImage::Format_RGB16:
252+ blit_template<qgray2, quint16>(screen, image, topLeft, region);
253+ return;
254+ case QImage::Format_RGB444:
255+ blit_template<qgray2, qrgb444>(screen, image, topLeft, region);
256+ return;
257+ case QImage::Format_ARGB4444_Premultiplied:
258+ blit_template<qgray2, qargb4444>(screen, image, topLeft, region);
259+ return;
260+ default:
261+ qCritical("blit_2(): Image format %d not supported!", image.format());
262+ }
263+}
264+#endif // QT_QWS_DEPTH_2
265+
266 #ifdef QT_QWS_DEPTH_1
267
268 struct qmono { quint8 dummy; } Q_PACKED;
269@@ -1259,6 +1459,11 @@ void qt_blit_setup(QScreen *screen, const QImage &image,
270 screen->d_ptr->blit = blit_4;
271 break;
272 #endif
273+#ifdef QT_QWS_DEPTH_2
274+ case 2:
275+ screen->d_ptr->blit = blit_2;
276+ break;
277+#endif
278 #ifdef QT_QWS_DEPTH_1
279 case 1:
280 screen->d_ptr->blit = blit_1;
281@@ -2146,6 +2351,8 @@ int QScreen::alloc(unsigned int r,unsigned int g,unsigned int b)
282 }
283 } else if (d == 4) {
284 ret = qGray(r, g, b) >> 4;
285+ } else if (d == 2) {
286+ ret = qGray(r, g, b) >> 6;
287 } else if (d == 1) {
288 ret = qGray(r, g, b) >= 128;
289 } else {
290@@ -2216,6 +2423,10 @@ bool QScreen::supportsDepth(int d) const
291 } else if(d==1) {
292 return true;
293 #endif
294+#ifdef QT_QWS_DEPTH_2
295+ } else if(d==2) {
296+ return true;
297+#endif
298 #ifdef QT_QWS_DEPTH_4
299 } else if(d==4) {
300 return true;
301diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp
302index 6f3caad..14159ee 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.8.0
318
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch
new file mode 100644
index 0000000000..aa464fd1ed
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch
@@ -0,0 +1,47 @@
1From 549342fa380ed2a9ad41be3d04ee2f0585f6a465 Mon Sep 17 00:00:00 2001
2From: Michael Lauer <mickey@vanille-media.de>
3Date: Wed, 26 Sep 2012 20:41:32 +0200
4Subject: [PATCH 13/21] configure: add "-crossarch" option
5
6Upstream-Status: Pending
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 configure | 7 ++++++-
11 1 file changed, 6 insertions(+), 1 deletion(-)
12
13diff --git a/configure b/configure
14index 79c1c7b..7983c3d 100755
15--- a/configure
16+++ b/configure
17@@ -1153,7 +1153,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|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot)
22+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-crossarch)
23 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
24 shift
25 VAL="$1"
26@@ -1709,6 +1709,9 @@ while [ "$#" -gt 0 ]; do
27 DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"`
28 DeviceVar set $DEV_VAR $DEV_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@@ -3324,6 +3327,8 @@ arm*)
37 ;;
38 esac
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--
461.8.0
47
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch
new file mode 100644
index 0000000000..66724a8ecf
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch
@@ -0,0 +1,41 @@
1From 21af8f6d21b28a53041affb11b58d6316023fa92 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/21] translations: fix phony translation linking error
5
6 | .../usr/lib/crt1.o: In function `_start':
7 | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
8 | collect2: ld returned 1 exit status
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 translations/translations.pro | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/translations/translations.pro b/translations/translations.pro
18index dc99beb..0d98829 100644
19--- a/translations/translations.pro
20+++ b/translations/translations.pro
21@@ -101,7 +101,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
22 updateqm.CONFIG += no_link
23 QMAKE_EXTRA_COMPILERS += updateqm
24
25-isEmpty(vcproj) {
26+!isEmpty(vcproj) {
27 QMAKE_LINK = @: IGNORE THIS LINE
28 OBJECTS_DIR =
29 win32:CONFIG -= embed_manifest_exe
30@@ -111,7 +111,7 @@ isEmpty(vcproj) {
31 phony_src.input = PHONY_DEPS
32 phony_src.output = phony.c
33 phony_src.variable_out = GENERATED_SOURCES
34- phony_src.commands = echo int main() { return 0; } > phony.c
35+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
36 phony_src.name = CREATE phony.c
37 phony_src.CONFIG += combine
38 QMAKE_EXTRA_COMPILERS += phony_src
39--
401.8.0
41
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch
new file mode 100644
index 0000000000..b5db49128c
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch
@@ -0,0 +1,32 @@
1From 9250fed086a4a8a645a972764a9bf34e4566ec2e 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/21] configure: add nostrip for debug packages
5
6Qt is built in release mode and strip files by default.
7Set CONFIG+=nostrip to avoid the stripping and
8let dh_strip do it to generate debug packages.
9
10Upstream-Status: Inappropriate [Configuration]
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 configure | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/configure b/configure
18index 7983c3d..d02824b 100755
19--- a/configure
20+++ b/configure
21@@ -710,6 +710,8 @@ mkdir -p "$outpath/config.tests"
22 rm -f "$outpath/config.tests/.qmake.cache"
23 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
24
25+QMakeVar add CONFIG nostrip
26+
27 QMakeVar add styles "cde mac motif plastique cleanlooks windows"
28 QMakeVar add decorations "default windows styled"
29 QMakeVar add mouse-drivers "pc"
30--
311.8.0
32
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch
new file mode 100644
index 0000000000..9c3de47b4b
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch
@@ -0,0 +1,37 @@
1From 8403634a71f067eec514b6d2193cf41e281dff8e 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/21] configure: eval QMAKE_CXX
5
6Allow expansion of $(...) references in QMAKE_CXX (currently its value
7is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
8which allows WebKit to be enabled.
9
10Upstream-Status: Pending
11
12Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14
15Conflicts:
16 configure
17---
18 configure | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
20
21diff --git a/configure b/configure
22index d02824b..891d6e7 100755
23--- a/configure
24+++ b/configure
25@@ -3409,7 +3409,8 @@ else
26 CFG_FRAMEWORK=no
27 fi
28
29-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
30+QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
31+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
32 TEST_COMPILER="$CXX"
33
34 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
35--
361.8.0
37
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
new file mode 100644
index 0000000000..9471966660
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
@@ -0,0 +1,46 @@
1From d2bb701b551402f0befddd0e906423596bdc0df7 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/21] configure: ensure we identify the compiler as g++ in
5 configure
6
7Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
8script was interpreting from this that the compiler was "oe-g++" and
9thus
10g++ specific checks were not being run since this string did not match;
11among other things this resulted in a compiler version check in the
12QtWebKit build code not working, and hence the following error at build
13time:
14
15./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword
16in C++0x [-Werror=c++0x-compat]
17
18The easiest thing since our PLATFORM is entirely artificial is to just
19force COMPILER to "g++" in the configure script if it is detected as
20"oe-g++".
21
22Upstream-Status: Inappropriate [configuration]
23
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(+)
29
30diff --git a/configure b/configure
31index 891d6e7..7031898 100755
32--- a/configure
33+++ b/configure
34@@ -7592,6 +7592,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then
35 else
36 COMPILER=`echo $PLATFORM | cut -f 2- -d-`
37 fi
38+case $COMPILER in
39+ *oe-g++) COMPILER="g++" ;;
40+esac
41 if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
42 CFG_EXCEPTIONS=no
43 fi
44--
451.8.0
46
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch
new file mode 100644
index 0000000000..19cdd4c57d
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch
@@ -0,0 +1,46 @@
1From d6dc1a7d6594d7e395347732a3e553fc82ccab3d Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 28 Feb 2012 15:10:24 +0000
4Subject: [PATCH 18/21] configure: make pulseaudio a configurable option
5
6Allows disabling pulseaudio support within phonon at configure time.
7(This is the Qt 4.8.0 version.)
8
9Upstream-Status: Pending
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 configure | 9 ++++++++-
15 1 file changed, 8 insertions(+), 1 deletion(-)
16
17diff --git a/configure b/configure
18index 7031898..a4a42f1 100755
19--- a/configure
20+++ b/configure
21@@ -1139,7 +1139,7 @@ while [ "$#" -gt 0 ]; do
22 VAL=no
23 ;;
24 #Qt style yes options
25- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
26+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-pulseaudio|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
27 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
28 VAL=yes
29 ;;
30@@ -2120,6 +2120,13 @@ while [ "$#" -gt 0 ]; do
31 UNKNOWN_OPT=yes
32 fi
33 ;;
34+ pulseaudio)
35+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
36+ CFG_PULSEAUDIO="$VAL"
37+ else
38+ UNKNOWN_OPT=yes
39+ fi
40+ ;;
41 gtkstyle)
42 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
43 CFG_QGTKSTYLE="$VAL"
44--
451.8.0
46
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
new file mode 100644
index 0000000000..a83d2470a1
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
@@ -0,0 +1,63 @@
1From 1f1da2f24d3028b250dbc2e98e2b7e37862b3771 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 19/21] 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.8.0
63
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch
new file mode 100644
index 0000000000..92eddebaec
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch
@@ -0,0 +1,41 @@
1From d90b496f9ffdc828928ef84afad43260ea67ec1f 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 20/21] 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.8.0
41
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch
new file mode 100644
index 0000000000..dbc90227a5
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch
@@ -0,0 +1,95 @@
1From 6742ac7ea6fd1e9c82ecb5305f84e721242f857d Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 5 Dec 2012 07:48:15 +0200
4Subject: [PATCH 21/21] configure: make qt4-native work with long building
5 path.
6
7Upstream-Status: Submitted
8
9Reference: https://bugreports.qt-project.org/browse/QTBUG-28292
10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 configure | 52 ++++++++++++++++++++++++++--------------------------
15 1 file changed, 26 insertions(+), 26 deletions(-)
16
17diff --git a/configure b/configure
18index a4a42f1..2358563 100755
19--- a/configure
20+++ b/configure
21@@ -4779,8 +4779,8 @@ DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INST
22 TODAY=`date +%Y-%m-%d`
23 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
24 /* License Info */
25-static const char qt_configure_licensee_str [256 + 12] = "$LICENSE_USER_STR";
26-static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR";
27+static const char qt_configure_licensee_str [512 + 12] = "$LICENSE_USER_STR";
28+static const char qt_configure_licensed_products_str [512 + 12] = "$LICENSE_PRODUCTS_STR";
29
30 /* Installation date */
31 static const char qt_configure_installation [12+11] = "qt_instdate=$TODAY";
32@@ -4805,36 +4805,36 @@ if [ ! -z "$QT_HOST_PREFIX" ]; then
33
34 #if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE)
35 /* Installation Info */
36-static const char qt_configure_prefix_path_str [256 + 12] = "$HOSTPREFIX_PATH_STR";
37-static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
38-static const char qt_configure_headers_path_str [256 + 12] = "$HOSTHEADERS_PATH_STR";
39-static const char qt_configure_libraries_path_str [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
40-static const char qt_configure_binaries_path_str [256 + 12] = "$HOSTBINARIES_PATH_STR";
41-static const char qt_configure_plugins_path_str [256 + 12] = "$HOSTPLUGINS_PATH_STR";
42-static const char qt_configure_imports_path_str [256 + 12] = "$HOSTIMPORTS_PATH_STR";
43-static const char qt_configure_data_path_str [256 + 12] = "$HOSTDATA_PATH_STR";
44-static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
45-static const char qt_configure_settings_path_str [256 + 12] = "$HOSTSETTINGS_PATH_STR";
46-static const char qt_configure_examples_path_str [256 + 12] = "$HOSTEXAMPLES_PATH_STR";
47-static const char qt_configure_demos_path_str [256 + 12] = "$HOSTDEMOS_PATH_STR";
48+static const char qt_configure_prefix_path_str [512 + 12] = "$HOSTPREFIX_PATH_STR";
49+static const char qt_configure_documentation_path_str[512 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
50+static const char qt_configure_headers_path_str [512 + 12] = "$HOSTHEADERS_PATH_STR";
51+static const char qt_configure_libraries_path_str [512 + 12] = "$HOSTLIBRARIES_PATH_STR";
52+static const char qt_configure_binaries_path_str [512 + 12] = "$HOSTBINARIES_PATH_STR";
53+static const char qt_configure_plugins_path_str [512 + 12] = "$HOSTPLUGINS_PATH_STR";
54+static const char qt_configure_imports_path_str [512 + 12] = "$HOSTIMPORTS_PATH_STR";
55+static const char qt_configure_data_path_str [512 + 12] = "$HOSTDATA_PATH_STR";
56+static const char qt_configure_translations_path_str [512 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
57+static const char qt_configure_settings_path_str [512 + 12] = "$HOSTSETTINGS_PATH_STR";
58+static const char qt_configure_examples_path_str [512 + 12] = "$HOSTEXAMPLES_PATH_STR";
59+static const char qt_configure_demos_path_str [512 + 12] = "$HOSTDEMOS_PATH_STR";
60 #else // QT_BOOTSTRAPPED
61 EOF
62 fi
63
64 cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
65 /* Installation Info */
66-static const char qt_configure_prefix_path_str [256 + 12] = "$PREFIX_PATH_STR";
67-static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
68-static const char qt_configure_headers_path_str [256 + 12] = "$HEADERS_PATH_STR";
69-static const char qt_configure_libraries_path_str [256 + 12] = "$LIBRARIES_PATH_STR";
70-static const char qt_configure_binaries_path_str [256 + 12] = "$BINARIES_PATH_STR";
71-static const char qt_configure_plugins_path_str [256 + 12] = "$PLUGINS_PATH_STR";
72-static const char qt_configure_imports_path_str [256 + 12] = "$IMPORTS_PATH_STR";
73-static const char qt_configure_data_path_str [256 + 12] = "$DATA_PATH_STR";
74-static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR";
75-static const char qt_configure_settings_path_str [256 + 12] = "$SETTINGS_PATH_STR";
76-static const char qt_configure_examples_path_str [256 + 12] = "$EXAMPLES_PATH_STR";
77-static const char qt_configure_demos_path_str [256 + 12] = "$DEMOS_PATH_STR";
78+static const char qt_configure_prefix_path_str [512 + 12] = "$PREFIX_PATH_STR";
79+static const char qt_configure_documentation_path_str[512 + 12] = "$DOCUMENTATION_PATH_STR";
80+static const char qt_configure_headers_path_str [512 + 12] = "$HEADERS_PATH_STR";
81+static const char qt_configure_libraries_path_str [512 + 12] = "$LIBRARIES_PATH_STR";
82+static const char qt_configure_binaries_path_str [512 + 12] = "$BINARIES_PATH_STR";
83+static const char qt_configure_plugins_path_str [512 + 12] = "$PLUGINS_PATH_STR";
84+static const char qt_configure_imports_path_str [512 + 12] = "$IMPORTS_PATH_STR";
85+static const char qt_configure_data_path_str [512 + 12] = "$DATA_PATH_STR";
86+static const char qt_configure_translations_path_str [512 + 12] = "$TRANSLATIONS_PATH_STR";
87+static const char qt_configure_settings_path_str [512 + 12] = "$SETTINGS_PATH_STR";
88+static const char qt_configure_examples_path_str [512 + 12] = "$EXAMPLES_PATH_STR";
89+static const char qt_configure_demos_path_str [512 + 12] = "$DEMOS_PATH_STR";
90 EOF
91
92 if [ ! -z "$QT_HOST_PREFIX" ]; then
93--
941.8.0
95
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf
new file mode 100644
index 0000000000..e58fb15718
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf
@@ -0,0 +1,56 @@
1#
2# qmake configuration for common gcc
3#
4
5QMAKE_CC = $(OE_QMAKE_CC)
6QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
7QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
8QMAKE_CFLAGS_DEPS += -M
9QMAKE_CFLAGS_WARN_ON += -Wall -W
10QMAKE_CFLAGS_WARN_OFF += -w
11QMAKE_CFLAGS_RELEASE +=
12QMAKE_CFLAGS_DEBUG += -g
13QMAKE_CFLAGS_SHLIB += -fPIC
14QMAKE_CFLAGS_STATIC_LIB += -fPIC
15QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
16QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
17QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
18QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
19
20QMAKE_CXX = $(OE_QMAKE_CXX)
21QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
22QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
23QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
24QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
25QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
26QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
27QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
28QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
29QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
30QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
31QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
32QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
33QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
34
35QMAKE_LINK = $(OE_QMAKE_LINK)
36QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
37QMAKE_LINK_C = $(OE_QMAKE_LINK)
38QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
39QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
40QMAKE_LFLAGS_RELEASE +=
41QMAKE_LFLAGS_DEBUG +=
42QMAKE_LFLAGS_APP +=
43QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
44QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
45
46QMAKE_PCH_OUTPUT_EXT = .gch
47
48# -Bsymbolic-functions (ld) support
49QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
50QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
51
52# some linking helper...
53CONFIG += rpath_libdirs
54
55# for the SDK
56isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.4/linux.conf
new file mode 100644
index 0000000000..86703813ca
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/linux.conf
@@ -0,0 +1,66 @@
1#
2# qmake configuration for common linux
3#
4
5QMAKE_CFLAGS_THREAD += -D_REENTRANT
6QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
7
8QMAKE_INCDIR =
9QMAKE_LIBDIR =
10QMAKE_INCDIR_X11 =
11QMAKE_LIBDIR_X11 =
12QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
13QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
14QMAKE_INCDIR_OPENGL =
15QMAKE_LIBDIR_OPENGL =
16QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
17QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
18QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
19QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
20QMAKE_INCDIR_EGL =
21QMAKE_LIBDIR_EGL =
22QMAKE_INCDIR_OPENVG =
23QMAKE_LIBDIR_OPENVG =
24
25
26QMAKE_LIBS =
27QMAKE_LIBS_DYNLOAD = -ldl
28QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
29QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
30QMAKE_LIBS_NIS = -lnsl
31QMAKE_LIBS_EGL = -lEGL
32QMAKE_LIBS_OPENGL = -lGL
33QMAKE_LIBS_OPENGL_QT = -lGL
34QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
35QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
36QMAKE_LIBS_OPENVG = -lOpenVG
37QMAKE_LIBS_THREAD = -lpthread
38
39QMAKE_MOC = $(OE_QMAKE_MOC)
40QMAKE_UIC = $(OE_QMAKE_UIC)
41QMAKE_UIC3 = $(OE_QMAKE_UIC3)
42QMAKE_RCC = $(OE_QMAKE_RCC)
43QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
44QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
45
46QMAKE_AR = $(OE_QMAKE_AR) cqs
47QMAKE_OBJCOPY = objcopy
48QMAKE_RANLIB =
49
50QMAKE_TAR = tar -cf
51QMAKE_GZIP = gzip -9f
52
53QMAKE_COPY = cp -f
54QMAKE_COPY_FILE = $(COPY)
55QMAKE_COPY_DIR = $(COPY) -r
56QMAKE_MOVE = mv -f
57QMAKE_DEL_FILE = rm -f
58QMAKE_DEL_DIR = rmdir
59QMAKE_STRIP = $(OE_QMAKE_STRIP)
60QMAKE_STRIPFLAGS_LIB += --strip-unneeded
61QMAKE_CHK_DIR_EXISTS = test -d
62QMAKE_MKDIR = mkdir -p
63QMAKE_INSTALL_FILE = install -m 644 -p
64QMAKE_INSTALL_PROGRAM = install -m 755 -p
65
66include(unix.conf)
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/qte.sh b/meta/recipes-qt/qt4/qt4-4.8.4/qte.sh
new file mode 100644
index 0000000000..21d6ecbd6a
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/qte.sh
@@ -0,0 +1,7 @@
1#!/bin/sh
2
3if [ -e /dev/input/touchscreen0 ]
4then
5 QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
6 export QWS_MOUSE_PROTO
7fi
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 13:32:51 +0000