From bb4c8adeeb3107074fbf63bddf292059b370afa5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 25 Jul 2013 17:45:16 +0200 Subject: 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 --- conf/distro/include/qt5-versions.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index b946a6a6..35dd211a 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/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}" -- cgit v1.2.3