From 9f4eb4e5565f7cc36ecc344b9044336aa8679b6a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 5 Jul 2013 15:49:51 +0100 Subject: [PATCH] qt4: Take PV increase opportunity to drop PR (From OE-Core rev: b97570c66737a6c404b49459cd95184abb855399) Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb | 2 -- meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb | 2 -- meta/recipes-qt/qt4/qt4-native_4.8.5.bb | 2 -- meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb | 2 -- 4 files changed, 8 deletions(-) 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 6a7eefe..9e5743b 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 c08927e..1435d85 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 85ca0f8..2443cc4 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 d6edef9..5cb5e68 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 += " \ -- 2.7.4