diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-08-03 15:27:50 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-09-13 14:57:38 +0200 |
| commit | c67873216bb476935a753c3597ba91d8029f307b (patch) | |
| tree | e77ccd3055ed11ebe261357fadc0dbfd5c727da4 /conf | |
| parent | 671313d0b5e09e0b49a90ed944cd33fb3d6457b0 (diff) | |
| download | meta-qt5-c67873216bb476935a753c3597ba91d8029f307b.tar.gz | |
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/qt5-versions.inc | 7 |
1 files changed, 1 insertions, 6 deletions
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 @@ | |||
| 1 | # Select which version you prefer by defining QT5_VERSION and including this file | 1 | # Select which version you prefer by defining QT5_VERSION and including this file |
| 2 | # possible values now "5.0.2", "5.1.0", "5.1.0+git%" | 2 | # possible values now "5.1.0", "5.1.0+git%" |
| 3 | 3 | ||
| 4 | QT5_VERSION ?= "5.1.0" | 4 | QT5_VERSION ?= "5.1.0" |
| 5 | 5 | ||
| @@ -19,8 +19,3 @@ PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" | |||
| 19 | PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" | 19 | PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" |
| 20 | PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" | 20 | PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" |
| 21 | PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" | 21 | PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" |
| 22 | |||
| 23 | # append % only if it isn't included already | ||
| 24 | # 5.1.0+git%% won't work and it's exactly where we need to overcome DEFAULT_PREFERENCE with PREFERRED_VERSION | ||
| 25 | QT5_VERSION_WAYLAND = "${@base_contains('QT5_VERSION', '5.1.0+git%', '${QT5_VERSION}', '${QT5_VERSION}%', d)}" | ||
| 26 | PREFERRED_VERSION_qtwayland = "${QT5_VERSION_WAYLAND}" | ||
