qt4: Make 4.8.1 the default version

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 5c1c97eeacfa40e250417764dec72c9e2ee4e611..e16264c377fcc7c0d23bbe36bb9a0a6ad3e82f75 100644 (file)
--- 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 d991c03ec2fff3a3b1900acba4d7e4e87f01efbe..533b5d6675d062dd7d2bb9ec00e7e44d80809a89 100644 (file)
--- 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 e6162fc20ced7e6ecf14a6dab3f6299e24ba5448..c4bd3cfdc37c4987db56847d0595ab8e9ef538af 100644 (file)
--- 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 edd3e0ebedcd2e86150f7631d623e8b9d877e08b..7afb51fea8d7a033f0444b4f0b5365dc1639717e 100644 (file)
--- 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 += " \