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>

diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc
index 7f26b9bd45a2071a840027d0857382976cfabc84..c58679f04cda0e1aee6b1b93f365bd9a0b8c587e 100644 (file)
--- 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 b88b1e94980230c143dfa42833ee59f7a33613cb..c3f671319909bdb8977fd30d7ec86a352504546a 100644 (file)
--- 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 359a7561d36665af333258a4cb44e4191b033f58..75c6314e7fec9f79eece98e1595598380a64c823 100644 (file)
--- 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 "