aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-06-07 09:20:50 +0200
committerKoen Kooi <koen@openembedded.org>2010-06-07 12:57:15 +0200
commit2ef4f1e00aa62d95e2c5a50f7b475f15eb059ea0 (patch)
tree68f90bb845e2931cb220b3e29c0eb6136c6fd9d1
parentbdfaa71fc6e60eb92cb31d8c1846a312a6bab765 (diff)
downloadopenembedded-2ef4f1e00aa62d95e2c5a50f7b475f15eb059ea0.tar.gz
openembedded-2ef4f1e00aa62d95e2c5a50f7b475f15eb059ea0.tar.bz2
openembedded-2ef4f1e00aa62d95e2c5a50f7b475f15eb059ea0.zip
qt 4.7.0-beta1: drop patches for affine and browser
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1.inc2
-rw-r--r--recipes/qt4/qt4-x11-free_4.7.0-beta1.bb2
2 files changed, 1 insertions, 3 deletions
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 "