From: Richard Purdie Date: Fri, 5 Jul 2013 14:49:51 +0000 (+0100) Subject: qt4: Take PV increase opportunity to drop PR X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~36776 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b97570c66737a6c404b49459cd95184abb855399;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git qt4: Take PV increase opportunity to drop PR Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb index 6a7eefe24ec..9e5743bb433 100644 --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb @@ -1,7 +1,5 @@ require nativesdk-qt4-tools.inc -PR = "${INC_PR}.0" - SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch" SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb index c08927edffd..1435d857ceb 100644 --- a/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb +++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb @@ -1,8 +1,6 @@ require qt4-${PV}.inc require qt4-embedded.inc -PR = "${INC_PR}.4" - QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}" QT_CONFIG_FLAGS += " \ diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.5.bb b/meta/recipes-qt/qt4/qt4-native_4.8.5.bb index 85ca0f8d97a..2443cc4b106 100644 --- a/meta/recipes-qt/qt4/qt4-native_4.8.5.bb +++ b/meta/recipes-qt/qt4/qt4-native_4.8.5.bb @@ -1,7 +1,5 @@ require qt4-native.inc -PR = "${INC_PR}.0" - TOBUILD := "src/tools/bootstrap ${TOBUILD}" SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb index d6edef94427..5cb5e6817d6 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb @@ -1,8 +1,6 @@ require qt4-x11-free.inc require qt4-${PV}.inc -PR = "${INC_PR}.4" - QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}" QT_CONFIG_FLAGS += " \