summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-05-17 16:18:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-18 13:32:48 (GMT)
commit3ea694cf688f26d47149200d0dc522da51a87e58 (patch)
tree5ea7230561767d93b0c0d7e494fb9087c6007360 /meta/recipes-qt
parent18b0adee1e79577b99eb4bdbcf43e749c8616719 (diff)
downloadpoky-3ea694cf688f26d47149200d0dc522da51a87e58.tar.gz
qt4: re-enable two 4.6.x patches in 4.7.3
Two patches that were being applied in 4.6.x are now applied for 4.7.3. The functions of these two patches are: * Add support for 2bpp (only affects qt4-embedded) * Use correct infix on QtUiTools library (only affects qt4-embedded as qt4-x11-free does not define an infix) (From OE-Core rev: 1eb0207a7ae8cbc31ecde313a020ed4f12f70dd8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb2
3 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc
index 7f26b9b..c58679f 100644
--- a/meta/recipes-qt/qt4/qt-4.7.3.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.3.inc
@@ -9,6 +9,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
9 file://0004-no-qmake.patch \ 9 file://0004-no-qmake.patch \
10 file://hack-out-pg2-4.7.0.patch \ 10 file://hack-out-pg2-4.7.0.patch \
11 file://0006-freetype-host-includes.patch \ 11 file://0006-freetype-host-includes.patch \
12 file://0008-qt-lib-infix.patch \
13 file://0009-support-2bpp.patch \
12 file://0001-Added-Openembedded-crossarch-option.patch \ 14 file://0001-Added-Openembedded-crossarch-option.patch \
13 file://g++.conf \ 15 file://g++.conf \
14 file://linux.conf \ 16 file://linux.conf \
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
index b88b1e9..c3f6713 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
@@ -1,7 +1,7 @@
1require qt-${PV}.inc 1require qt-${PV}.inc
2require qt4-embedded.inc 2require qt4-embedded.inc
3 3
4PR = "${INC_PR}.0" 4PR = "${INC_PR}.1"
5 5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7 7
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
index 359a756..75c6314 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
@@ -1,7 +1,7 @@
1require qt4-x11-free.inc 1require qt4-x11-free.inc
2require qt-${PV}.inc 2require qt-${PV}.inc
3 3
4PR = "${INC_PR}.0" 4PR = "${INC_PR}.1"
5 5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7 7