diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-25 15:47:15 +0200 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2015-01-09 08:46:01 -0800 |
| commit | 35d71a7b4bf339fecbf9a38c49dd25c77fb65623 (patch) | |
| tree | 280dd47c751adfb4ba346481ea3dd17b5f4ed860 /meta-qt5/conf | |
| parent | 0bc6c4802d4c131acd0903f869c90ffd869f7a31 (diff) | |
| download | tizen-distro-35d71a7b4bf339fecbf9a38c49dd25c77fb65623.tar.gz tizen-distro-35d71a7b4bf339fecbf9a38c49dd25c77fb65623.tar.bz2 tizen-distro-35d71a7b4bf339fecbf9a38c49dd25c77fb65623.zip | |
recipes: upgrade from 5.3.0 to 5.3.1
(From meta-qt5 rev: b26453cd28ed913d68e6ab2a0da0a13b1ce40098)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Diffstat (limited to 'meta-qt5/conf')
| -rw-r--r-- | meta-qt5/conf/distro/include/qt5-versions.inc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta-qt5/conf/distro/include/qt5-versions.inc b/meta-qt5/conf/distro/include/qt5-versions.inc index 94b0462599..0fc4e621bc 100644 --- a/meta-qt5/conf/distro/include/qt5-versions.inc +++ b/meta-qt5/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}" |