qt5-native, qtbase: Git version is preferred

Atleast until qt5 is offciall released. Also updated git SHAs

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>

5 files changed, 7 insertions, 5 deletions

diff --git a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc b/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc
index a0bc754d..40318444 100644
--- a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc
+++ b/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc
@@ -10,6 +10,8 @@ SRC_URI += " \
 
 S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}"
 
+DEFAULT_PREFERENCE = "-1"
+
 LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \
                     file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc
index 2d5bd2b9..4804789c 100644
--- a/recipes-qt/qt5/qt5-4.999+git.inc
+++ b/recipes-qt/qt5/qt5-4.999+git.inc
@@ -9,9 +9,7 @@ SRC_URI += " \
 
 S = "${WORKDIR}/git"
 
-PV = "4.999+5.0.0-beta2+gitr${SRCPV}"
-
-DEFAULT_PREFERENCE = "-1"
+PV = "4.999+5.0.0-beta2+git-r${SRCPV}"
 
 LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \
diff --git a/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb
index 58915414..21e51e58 100644
--- a/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb
+++ b/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb
@@ -3,5 +3,7 @@ require qt5-${PV}.inc
 
 PR = "${INC_PR}.0"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2"
 SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f"
diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb
index b6072fa3..ae6df1ca 100644
--- a/recipes-qt/qt5/qt5-native_4.999+git.bb
+++ b/recipes-qt/qt5/qt5-native_4.999+git.bb
@@ -3,4 +3,4 @@ require qt5-4.999+git.inc
 
 PR = "${INC_PR}.0"
 
-SRCREV = "f7d99ad50f11ee7c263d4c2bdbe024355a1ab3e9"
+SRCREV = "b9321a1a5f1b255e5e5860edb42c63a4e4da6804"
diff --git a/recipes-qt/qt5/qtbase_4.999+git.bb b/recipes-qt/qt5/qtbase_4.999+git.bb
index fe8fd1e5..0477df24 100644
--- a/recipes-qt/qt5/qtbase_4.999+git.bb
+++ b/recipes-qt/qt5/qtbase_4.999+git.bb
@@ -3,4 +3,4 @@ require qt5-4.999+git.inc
 
 PR = "${INC_PR}.0"
 
-SRCREV = "f7d99ad50f11ee7c263d4c2bdbe024355a1ab3e9"
+SRCREV = "b9321a1a5f1b255e5e5860edb42c63a4e4da6804"
\ No newline at end of file