diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-25 17:45:16 +0200 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2015-01-09 08:44:53 -0800 |
| commit | e1e888b3bbe0aa55f7aaa658cd27e7e59688b558 (patch) | |
| tree | 754a78232bef5aad28d37d529c1ee487e598ebb7 /meta-qt5/conf | |
| parent | 52b95fba3de5e9b4e600b7759711942f017ccd9c (diff) | |
| download | tizen-distro-e1e888b3bbe0aa55f7aaa658cd27e7e59688b558.tar.gz tizen-distro-e1e888b3bbe0aa55f7aaa658cd27e7e59688b558.tar.bz2 tizen-distro-e1e888b3bbe0aa55f7aaa658cd27e7e59688b558.zip | |
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
(From meta-qt5 rev: bb4c8adeeb3107074fbf63bddf292059b370afa5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Diffstat (limited to 'meta-qt5/conf')
| -rw-r--r-- | meta-qt5/conf/distro/include/qt5-versions.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-qt5/conf/distro/include/qt5-versions.inc b/meta-qt5/conf/distro/include/qt5-versions.inc index b946a6a62d..35dd211af2 100644 --- a/meta-qt5/conf/distro/include/qt5-versions.inc +++ b/meta-qt5/conf/distro/include/qt5-versions.inc @@ -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}" |