summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-11-19 14:22:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-20 15:31:47 +0000
commit4e2de8f749103a54d51f627e75401b70bb41d47c (patch)
tree967442f6343d8dff2b6c254506bdd454dbff8f55 /meta/recipes-qt/qt4
parent90616875b432a932415063b08497266e70c49d75 (diff)
downloadpoky-4e2de8f749103a54d51f627e75401b70bb41d47c.tar.gz
qt4: remove negative preference on 4.8.3
(From OE-Core rev: 36e42fa771ddd11e169d92dd31d213ba84538012) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.3.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.3.bb2
3 files changed, 0 insertions, 6 deletions
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 @@
1require nativesdk-qt4-tools.inc 1require nativesdk-qt4-tools.inc
2 2
3DEFAULT_PREFERENCE = "-1"
4
5PR = "${INC_PR}.0" 3PR = "${INC_PR}.0"
6 4
7SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch" 5SRC_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 \
5 5
6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" 6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
7 7
8DEFAULT_PREFERENCE = "-1"
9
10SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \ 8SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \
11 file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ 9 file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
12 file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \ 10 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 @@
1require qt4-native.inc 1require qt4-native.inc
2 2
3DEFAULT_PREFERENCE = "-1"
4
5PR = "${INC_PR}.0" 3PR = "${INC_PR}.0"
6 4
7TOBUILD := "src/tools/bootstrap ${TOBUILD}" 5TOBUILD := "src/tools/bootstrap ${TOBUILD}"