summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-06-25 15:47:15 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-07-06 19:45:44 +0200
commitb26453cd28ed913d68e6ab2a0da0a13b1ce40098 (patch)
tree0296514f3790e3d4c6226b5f676f6cd28f8db3d9 /conf
parent0d9ca1b1bd06a9f2221cbfd6b7364c74fd20f21a (diff)
downloadmeta-qt5-b26453cd28ed913d68e6ab2a0da0a13b1ce40098.tar.gz
recipes: upgrade from 5.3.0 to 5.3.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/qt5-versions.inc9
1 files changed, 3 insertions, 6 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index 94b04625..0fc4e621 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -1,12 +1,13 @@
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.0", "5.3.0+git%" 2# possible values now "5.3.1", "5.3.0+git%"
3 3
4QT5_VERSION ?= "5.3.0" 4QT5_VERSION ?= "5.3.1"
5 5
6PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" 6PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
7PREFERRED_VERSION_qtbase = "${QT5_VERSION}" 7PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
8PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}" 8PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}"
9PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}" 9PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}"
10PREFERRED_VERSION_qtenginio = "${QT5_VERSION}"
10PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}" 11PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}"
11PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}" 12PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}"
12PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}" 13PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}"
@@ -26,7 +27,3 @@ PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
26PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" 27PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}"
27PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}" 28PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}"
28PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" 29PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}"
29
30# qtenginio doesn't follow qt5 versioning, see https://bugreports.qt-project.org/browse/QTBUG-37791
31QT5_VERSION_QTENGINIO = "${@base_contains('QT5_VERSION', '5.3.0+git%', '${QT5_VERSION}', '1.0.4%', d)}"
32PREFERRED_VERSION_qtenginio = "${QT5_VERSION_QTENGINIO}"