diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-29 05:48:44 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-04 04:25:11 +0200 |
commit | be2d4815efd7b8312700a426a5cafcd86a93666b (patch) | |
tree | ef3c3ed2e3092535fe0e4a14d2834c1ccbd72d19 /conf | |
parent | 096112d4ab8bad1c45ab0bc40354d9a9bb3e097d (diff) | |
download | meta-qt5-be2d4815efd7b8312700a426a5cafcd86a93666b.tar.gz |
qt5: upgrade git recipes to 5.4-alpha1
* introduce 2nd set of qtwayland and qtwebengine recipes, because newer
revision isn't compatible with 5.3.2 release
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/include/qt5-versions.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index ff2eae7e..7530a245 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.3.2", "5.3.0+git%" | 2 | # possible values now "5.3.2", "5.3.0+5.4.0-alpha1+git" |
3 | 3 | ||
4 | QT5_VERSION ?= "5.3.2" | 4 | QT5_VERSION ?= "5.3.2" |
5 | 5 | ||
@@ -7,6 +7,7 @@ PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" | |||
7 | PREFERRED_VERSION_qtbase = "${QT5_VERSION}" | 7 | PREFERRED_VERSION_qtbase = "${QT5_VERSION}" |
8 | PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}" | 8 | PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}" |
9 | PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}" | 9 | PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}" |
10 | PREFERRED_VERSION_qtconnectivity = "${QT5_VERSION}" | ||
10 | PREFERRED_VERSION_qtenginio = "${QT5_VERSION}" | 11 | PREFERRED_VERSION_qtenginio = "${QT5_VERSION}" |
11 | PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}" | 12 | PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}" |
12 | PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}" | 13 | PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}" |
@@ -23,6 +24,9 @@ PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" | |||
23 | PREFERRED_VERSION_qttools = "${QT5_VERSION}" | 24 | PREFERRED_VERSION_qttools = "${QT5_VERSION}" |
24 | PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" | 25 | PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" |
25 | PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}" | 26 | PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}" |
27 | PREFERRED_VERSION_qtwayland = "${QT5_VERSION}" | ||
28 | PREFERRED_VERSION_qtwayland-native = "${QT5_VERSION}" | ||
29 | PREFERRED_VERSION_qtwebengine = "${QT5_VERSION}" | ||
26 | PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" | 30 | PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" |
27 | PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" | 31 | PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" |
28 | PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}" | 32 | PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}" |