summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-05-17 17:18:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-18 14:32:28 +0100
commit1eb0207a7ae8cbc31ecde313a020ed4f12f70dd8 (patch)
tree6b12a547acc2987114f4ecacf427ca277b330873
parent5eed81039f33b846303a2032afcf832709b18210 (diff)
downloadopenembedded-core-contrib-1eb0207a7ae8cbc31ecde313a020ed4f12f70dd8.tar.gz
openembedded-core-contrib-1eb0207a7ae8cbc31ecde313a020ed4f12f70dd8.tar.bz2
openembedded-core-contrib-1eb0207a7ae8cbc31ecde313a020ed4f12f70dd8.zip
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) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-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 7f26b9bd45..c58679f04c 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}.
file://0004-no-qmake.patch \
file://hack-out-pg2-4.7.0.patch \
file://0006-freetype-host-includes.patch \
+ file://0008-qt-lib-infix.patch \
+ file://0009-support-2bpp.patch \
file://0001-Added-Openembedded-crossarch-option.patch \
file://g++.conf \
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 b88b1e9498..c3f6713199 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 @@
require qt-${PV}.inc
require qt4-embedded.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
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 359a7561d3..75c6314e7f 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 @@
require qt4-x11-free.inc
require qt-${PV}.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "