From 35aea9a7e7709217a051a72252a2893b68b6d178 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 27 Apr 2012 12:23:05 +0100
Subject: qt4: Make 4.8.1 the default version
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb | 2 --
meta/recipes-qt/qt4/qt4-native_4.8.1.bb | 2 --
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb | 2 --
meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb | 2 --
4 files changed, 8 deletions(-)
(limited to 'meta/recipes-qt')
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 5c1c97eea..e16264c37 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
PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
QT_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 d991c03ec..533b5d667 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
PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
# Find the g++.conf/linux.conf in the right directory.
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
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 e6162fc20..c4bd3cfdc 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"
SRC_URI += "file://qmake_pri_fixes.patch"
-DEFAULT_PREFERENCE = "-1"
-
SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
SRC_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 edd3e0ebe..7afb51fea 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
PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
QT_CONFIG_FLAGS += " \
--
cgit v1.2.3