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>
This commit is contained in:
Paul Eggleton 2011-05-17 17:18:16 +01:00 committed by Richard Purdie
parent 18b0adee1e
commit 3ea694cf68
3 changed files with 4 additions and 2 deletions

View File

@ -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 \

View File

@ -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 "

View File

@ -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 "