[meta-qt5][PATCH 1/2] qt5: make 5.0.2 the default

[meta-qt5][PATCH 1/2] qt5: make 5.0.2 the default

[Eric Bénard]

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 recipes-qt/qt5/qt5-5.0.2.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc
index f99809e..303e066 100644
--- a/recipes-qt/qt5/qt5-5.0.2.inc
+++ b/recipes-qt/qt5/qt5-5.0.2.inc
@@ -6,7 +6,7 @@ QT_VERSION ?= "${PV}"
 # it's different for RC versions
 QT_VERSION_DIR ?= "${QT_VERSION}"
 
-DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE = "1"
 
 SRC_URI += " \
     http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
-- 
1.7.10.4

[meta-qt5][PATCH 2/2] qtjsbackend: hardfloat patch is only needed for 5.0.2

[Eric Bénard]

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 recipes-qt/qt5/qtjsbackend.inc      |    1 -
 recipes-qt/qt5/qtjsbackend_5.0.2.bb |    4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc
index a0dc632..4479654 100644
--- a/recipes-qt/qt5/qtjsbackend.inc
+++ b/recipes-qt/qt5/qtjsbackend.inc
@@ -13,5 +13,4 @@ INC_PR = "r0"
 
 SRC_URI += " \
     file://0002-v8.pro-respect-external-host-bindir-when-set.patch \
-    file://0001-Fix-hardfloat-detection.patch \
 "
diff --git a/recipes-qt/qt5/qtjsbackend_5.0.2.bb b/recipes-qt/qt5/qtjsbackend_5.0.2.bb
index 9dcbcc0..0f8638e 100644
--- a/recipes-qt/qt5/qtjsbackend_5.0.2.bb
+++ b/recipes-qt/qt5/qtjsbackend_5.0.2.bb
@@ -3,5 +3,9 @@ require ${PN}.inc
 
 PR = "${INC_PR}.0"
 
+SRC_URI += " \
+    file://0001-Fix-hardfloat-detection.patch \
+    "
+
 SRC_URI[md5sum] = "610f011757755888153cb2004c04446f"
 SRC_URI[sha256sum] = "65071ab9ab7d9024b7ba6d128a1c97ac09cf1b37818affb4238e4ba7d6665cc0"
-- 
1.7.10.4