From c67873216bb476935a753c3597ba91d8029f307b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 3 Aug 2013 15:27:50 +0200 Subject: recipes-qt5: Drop 5.0.2 version and 2nd qtwayland recipe * this will make maintaining meta-qt5 a bit easier Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'conf/distro') diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index ea159700..81cb8cbb 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,5 +1,5 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.0.2", "5.1.0", "5.1.0+git%" +# possible values now "5.1.0", "5.1.0+git%" QT5_VERSION ?= "5.1.0" @@ -19,8 +19,3 @@ PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" PREFERRED_VERSION_qtxmlpatterns = "${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-54-g00ecf