From 5d7223bc80ed9b8b531d70e2e8863500c46444c1 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 19 Feb 2016 14:57:24 +0200 Subject: Update qt5 addons revisions Change-Id: Ib85b2d7f2b50441cd48d10796acceb731a816b8e Reviewed-by: Teemu Holappa --- recipes-qt/b2qt-addons/b2qt-demos.bb | 6 +++--- recipes-qt/b2qt-addons/b2qt-launcher.bb | 2 +- .../qt5-addons/qtdeclarative-render2d_git.bb | 2 +- recipes-qt/qt5-addons/qtquickcompiler_git.bb | 3 +-- recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb | 22 +++++++++++++++++++++- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 7b7f607..9270a0f 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -39,9 +39,9 @@ PV = "1.0+git${SRCPV}" BRANCH = "5.6" BROWSER_BRANCH = "dev" QT_BRANCH = "5.6" -SRCREV_demos = "6175a1ca037552ab237c6418233d7135753cf48d" -SRCREV_qtcanvas3d = "bb1504c271e18a26ad6ac20d55485c167671b1c2" -SRCREV_qtquickcontrols = "5a992a14da4334364d81ad8d9e0b270ad0bb370d" +SRCREV_demos = "d9d77da89ac7fea96fae940b74c0dfc2225d0b52" +SRCREV_qtcanvas3d = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18" +SRCREV_qtquickcontrols = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df" SRCREV_qtwebbrowser = "c86bb8a400f79be205025598310926df5d01c7bc" SRCREV_FORMAT = "demos_qtcanvas3d_qtquickcontrols_qtwebbrowser" diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 147f90b..b73b477 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -32,7 +32,7 @@ SRC_URI = " \ file://b2qt.service \ " -SRCREV = "8dac8f162f60f7f7359d6a7c6fbd091f2b8656c1" +SRCREV = "b92077ac6962c9f42f778facbdea4a81affb22c1" BRANCH = "5.6" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb index bdca585..38de1a5 100644 --- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb +++ b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb @@ -27,6 +27,6 @@ inherit qt5-module require recipes-qt/qt5/qt5-git.inc QT_MODULE_BRANCH = "5.6" -SRCREV = "849ee6c976ba3574b1856eb9d16c2bd740a6d2e3" +SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62" DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5-addons/qtquickcompiler_git.bb index 4ddb443..b09af7c 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler_git.bb +++ b/recipes-qt/qt5-addons/qtquickcompiler_git.bb @@ -29,8 +29,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ " -# v5.6.0 -SRCREV = "cd525cef2026cddb8d8c2a3b9532967dbb676460" +SRCREV = "494283b7bf77f2801021e185c95ef948632ddddf" BRANCH = "5.6" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb index 8a0e28f..5639d60 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb @@ -27,13 +27,33 @@ inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc QT_MODULE_BRANCH = "5.6" -SRCREV = "214dc00d3e40fddba8acb2ea602aba705b1e3c81" +SRCREV = "4d480f8f0c1ca3308f4c3a423ad30d5d44e9c1bf" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" PACKAGECONFIG ?= "lipi-toolkit lang-all" +PACKAGECONFIG[t9write] = "CONFIG+=t9write" PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" +PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR" +PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK" +PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE" +PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB" +PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES" +PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA" +PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI" +PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR" +PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN" +PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT" +PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP" +PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR" +PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO" +PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL" +PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT" +PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU" +PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE" +PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN" +PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW" EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}" -- cgit v1.2.3-54-g00ecf