diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-05-30 14:37:26 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-10 12:11:51 +0200 |
| commit | cf2c7816fd053ff16a41abdc6f2a89fe9ff7a7ff (patch) | |
| tree | a9bd7e40b22d3ccf789a0506a4c2fc7c30593d6f /conf | |
| parent | a0da57e5ce2862758e10b82c30c200e365b29f46 (diff) | |
recipes-git: Upgrade to latest origin/stable
* qtbase: Fix undefined reference to qt_blend_argb32_on_argb32_ssse3
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, 7 insertions, 2 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index a2cc1fc3..94b04625 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,7 +1,7 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.2.1", "5.2.1+git%" +# possible values now "5.3.0", "5.3.0+git%" -QT5_VERSION ?= "5.2.1" +QT5_VERSION ?= "5.3.0" PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" PREFERRED_VERSION_qtbase = "${QT5_VERSION}" @@ -24,4 +24,9 @@ PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}" 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}" |