sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

qtwayland: demote 5.1.0+git version a bit 

* 5.0.2+git should stay default for people without qt5-versions.inc
* make sure that % isn't appended twice in qt5-versions.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2013-07-25 17:45:16 +02:00
parent 07301a1636
commit bb4c8adeeb
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/distro/include/qt5-versions.inc
View File

@ -17,4 +17,8 @@ PREFERRED_VERSION_qtscript = "${QT5_VERSION}"
PREFERRED_VERSION_qtsvg = "${QT5_VERSION}"
PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}"
PREFERRED_VERSION_qtwayland = "${QT5_VERSION}%"
# append % only if it isn't included already
# 5.1.0+git%% won't work and it's exactly where we need to overcome DEFAULT_PREFERENCE with PREFERRED_VERSION
QT5_VERSION_WAYLAND = "${@base_contains('QT5_VERSION', '5.1.0+git%', '${QT5_VERSION}', '${QT5_VERSION}%', d)}"
PREFERRED_VERSION_qtwayland = "${QT5_VERSION_WAYLAND}"

3
recipes-qt/qt5/qtwayland_5.1.0+git.bb
View File

@ -5,6 +5,9 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-5.1.0+git:"
DEPENDS += "qtwayland-native"
# qtwayland_git has -1 and should be default
DEFAULT_PREFERRENCE = "-2"
# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
# this PV is only to indicate that this recipe is compatible with qt5 5.1.0
# while qtwayland_git stays compatible with 5.0.2