From: Ross Burton Date: Mon, 19 Nov 2012 14:22:33 +0000 (+0000) Subject: qt4: remove negative preference on 4.8.3 X-Git-Tag: 2015-4~8679 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=36e42fa771ddd11e169d92dd31d213ba84538012;p=openembedded-core.git qt4: remove negative preference on 4.8.3 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb index ad5d8815c5..51afe130f8 100644 --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb @@ -1,7 +1,5 @@ require nativesdk-qt4-tools.inc -DEFAULT_PREFERENCE = "-1" - PR = "${INC_PR}.0" SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch" diff --git a/meta/recipes-qt/qt4/qt4-4.8.3.inc b/meta/recipes-qt/qt4/qt4-4.8.3.inc index e473dc6917..4b80c6c334 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.3.inc +++ b/meta/recipes-qt/qt4/qt4-4.8.3.inc @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \ file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \ diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.3.bb b/meta/recipes-qt/qt4/qt4-native_4.8.3.bb index 0f93187e17..afae0aec32 100644 --- a/meta/recipes-qt/qt4/qt4-native_4.8.3.bb +++ b/meta/recipes-qt/qt4/qt4-native_4.8.3.bb @@ -1,7 +1,5 @@ require qt4-native.inc -DEFAULT_PREFERENCE = "-1" - PR = "${INC_PR}.0" TOBUILD := "src/tools/bootstrap ${TOBUILD}"