Patchwork [1/2] qt4: remove negative preference on 4.8.3

login
register
mail settings
Submitter Ross Burton
Date Nov. 19, 2012, 2:22 p.m.
Message ID <1353334954-4909-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/39245/
State Accepted
Commit 36e42fa771ddd11e169d92dd31d213ba84538012
Headers show

Comments

Ross Burton - Nov. 19, 2012, 2:22 p.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb |    2 --
 meta/recipes-qt/qt4/qt4-4.8.3.inc                |    2 --
 meta/recipes-qt/qt4/qt4-native_4.8.3.bb          |    2 --
 3 files changed, 6 deletions(-)
Eric BENARD - Nov. 19, 2012, 2:36 p.m.
Le Mon, 19 Nov 2012 14:22:33 +0000,
Ross Burton <ross.burton@intel.com> a écrit :

> Signed-off-by: Ross Burton <ross.burton@intel.com>
Acked-by: Eric Bénard <eric@eukrea.com>
Tested on ARMv7 targets using danny.

Eric
Otavio Salvador - Nov. 19, 2012, 5:35 p.m.
On Mon, Nov 19, 2012 at 12:22 PM, Ross Burton <ross.burton@intel.com> wrote:

> Signed-off-by: Ross Burton <ross.burton@intel.com>
>

This change ought to be commited before removal of 4.8.1 version.

Patch

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 ad5d881..51afe13 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 e473dc6..4b80c6c 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 0f93187..afae0ae 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}"