summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-27 12:23:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-30 11:37:29 +0100
commit7670afc0ca775c9af31221e3f8ff0ef39fb4adb7 (patch)
tree20ca4a9c508acc021df1e0192225597e0268e68e /meta/recipes-qt
parent6723f6be766b8dd4b367237e25f96eda75893e0c (diff)
downloadpoky-7670afc0ca775c9af31221e3f8ff0ef39fb4adb7.tar.gz
qt4: Make 4.8.1 the default version
(From OE-Core rev: 35aea9a7e7709217a051a72252a2893b68b6d178) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.1.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb2
4 files changed, 0 insertions, 8 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
index 5c1c97eeac..e16264c377 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
@@ -3,8 +3,6 @@ require qt4-embedded.inc
3 3
4PR = "${INC_PR}.0" 4PR = "${INC_PR}.0"
5 5
6DEFAULT_PREFERENCE = "-1"
7
8QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
9 7
10QT_CONFIG_FLAGS += " \ 8QT_CONFIG_FLAGS += " \
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.1.bb b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
index d991c03ec2..533b5d6675 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
@@ -2,8 +2,6 @@ require qt4-native.inc
2 2
3PR = "${INC_PR}.0" 3PR = "${INC_PR}.0"
4 4
5DEFAULT_PREFERENCE = "-1"
6
7# Find the g++.conf/linux.conf in the right directory. 5# Find the g++.conf/linux.conf in the right directory.
8FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" 6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
9 7
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb
index e6162fc20c..c4bd3cfdc3 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb
@@ -4,7 +4,5 @@ PR = "${INC_PR}.0"
4 4
5SRC_URI += "file://qmake_pri_fixes.patch" 5SRC_URI += "file://qmake_pri_fixes.patch"
6 6
7DEFAULT_PREFERENCE = "-1"
8
9SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff" 7SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
10SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8" 8SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
index edd3e0ebed..7afb51fea8 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
@@ -3,8 +3,6 @@ require qt-${PV}.inc
3 3
4PR = "${INC_PR}.0" 4PR = "${INC_PR}.0"
5 5
6DEFAULT_PREFERENCE = "-1"
7
8QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
9 7
10QT_CONFIG_FLAGS += " \ 8QT_CONFIG_FLAGS += " \