From: Koen Kooi <koen@openembedded.org>
Date: Mon, 7 Jun 2010 07:20:50 +0000 (+0200)
Subject: qt 4.7.0-beta1: drop patches for affine and browser
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ef4f1e00aa62d95e2c5a50f7b475f15eb059ea0;p=openembedded.git

qt 4.7.0-beta1: drop patches for affine and browser
---

diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
index c691981d92..eb19285b21 100644
--- a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
@@ -13,10 +13,8 @@ SRC_URI = "\
 	file://0003-Disable-examples-designer.patch \
 	file://0004-Disable-exaqmples-dbus-remotecontrolledcar.patch \
 	file://0005-Disable-examples-help.patch \
-	file://0006-Disable-demos-browser.patch \
 	file://0007-Disable-demos-qtdemos.patch \
 	file://0008-Disable-examples-declarative.patch \
-	file://0009-Disable-demos-affine.patch \
 	file://g++.conf \
 	file://linux.conf \
            "
diff --git a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb b/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb
index 228b686d95..beef15829c 100644
--- a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb
+++ b/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb
@@ -3,7 +3,7 @@ DEFAULT_PREFERENCE = "-1"
 require qt4-x11-free.inc
 
 PV = "4.6.2+4.7.0-beta1"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "