diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-25 15:47:15 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-06 19:45:44 +0200 |
| commit | b26453cd28ed913d68e6ab2a0da0a13b1ce40098 (patch) | |
| tree | 0296514f3790e3d4c6226b5f676f6cd28f8db3d9 /conf | |
| parent | 0d9ca1b1bd06a9f2221cbfd6b7364c74fd20f21a (diff) | |
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.inc | 9 |
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 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.3.0", "5.3.0+git%" +# possible values now "5.3.1", "5.3.0+git%" -QT5_VERSION ?= "5.3.0" +QT5_VERSION ?= "5.3.1" PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" PREFERRED_VERSION_qtbase = "${QT5_VERSION}" PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}" PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}" +PREFERRED_VERSION_qtenginio = "${QT5_VERSION}" PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}" PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}" PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}" @@ -26,7 +27,3 @@ PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}" PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" - -# qtenginio doesn't follow qt5 versioning, see https://bugreports.qt-project.org/browse/QTBUG-37791 -QT5_VERSION_QTENGINIO = "${@base_contains('QT5_VERSION', '5.3.0+git%', '${QT5_VERSION}', '1.0.4%', d)}" -PREFERRED_VERSION_qtenginio = "${QT5_VERSION_QTENGINIO}" |