summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-02-19 14:57:24 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2016-02-19 19:45:46 +0000
commit5d7223bc80ed9b8b531d70e2e8863500c46444c1 (patch)
tree34e042e12108e7ac44cf035523cf9c56222827d1
parent03553bb020b4f826ee94ff20fb5166822798235d (diff)
downloadmeta-boot2qt-5d7223bc80ed9b8b531d70e2e8863500c46444c1.tar.gz
Update qt5 addons revisions
Change-Id: Ib85b2d7f2b50441cd48d10796acceb731a816b8e Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
-rw-r--r--recipes-qt/b2qt-addons/b2qt-demos.bb6
-rw-r--r--recipes-qt/b2qt-addons/b2qt-launcher.bb2
-rw-r--r--recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb2
-rw-r--r--recipes-qt/qt5-addons/qtquickcompiler_git.bb3
-rw-r--r--recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb22
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}"
39BRANCH = "5.6" 39BRANCH = "5.6"
40BROWSER_BRANCH = "dev" 40BROWSER_BRANCH = "dev"
41QT_BRANCH = "5.6" 41QT_BRANCH = "5.6"
42SRCREV_demos = "6175a1ca037552ab237c6418233d7135753cf48d" 42SRCREV_demos = "d9d77da89ac7fea96fae940b74c0dfc2225d0b52"
43SRCREV_qtcanvas3d = "bb1504c271e18a26ad6ac20d55485c167671b1c2" 43SRCREV_qtcanvas3d = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18"
44SRCREV_qtquickcontrols = "5a992a14da4334364d81ad8d9e0b270ad0bb370d" 44SRCREV_qtquickcontrols = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df"
45SRCREV_qtwebbrowser = "c86bb8a400f79be205025598310926df5d01c7bc" 45SRCREV_qtwebbrowser = "c86bb8a400f79be205025598310926df5d01c7bc"
46SRCREV_FORMAT = "demos_qtcanvas3d_qtquickcontrols_qtwebbrowser" 46SRCREV_FORMAT = "demos_qtcanvas3d_qtquickcontrols_qtwebbrowser"
47 47
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 = " \
32 file://b2qt.service \ 32 file://b2qt.service \
33 " 33 "
34 34
35SRCREV = "8dac8f162f60f7f7359d6a7c6fbd091f2b8656c1" 35SRCREV = "b92077ac6962c9f42f778facbdea4a81affb22c1"
36BRANCH = "5.6" 36BRANCH = "5.6"
37 37
38S = "${WORKDIR}/git" 38S = "${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
27require recipes-qt/qt5/qt5-git.inc 27require recipes-qt/qt5/qt5-git.inc
28 28
29QT_MODULE_BRANCH = "5.6" 29QT_MODULE_BRANCH = "5.6"
30SRCREV = "849ee6c976ba3574b1856eb9d16c2bd740a6d2e3" 30SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62"
31 31
32DEPENDS = "qtbase qtdeclarative" 32DEPENDS = "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 = " \
29 git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ 29 git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \
30 " 30 "
31 31
32# v5.6.0 32SRCREV = "494283b7bf77f2801021e185c95ef948632ddddf"
33SRCREV = "cd525cef2026cddb8d8c2a3b9532967dbb676460"
34BRANCH = "5.6" 33BRANCH = "5.6"
35 34
36S = "${WORKDIR}/git" 35S = "${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
27require recipes-qt/qt5/qt5-git.inc 27require recipes-qt/qt5/qt5-git.inc
28 28
29QT_MODULE_BRANCH = "5.6" 29QT_MODULE_BRANCH = "5.6"
30SRCREV = "214dc00d3e40fddba8acb2ea602aba705b1e3c81" 30SRCREV = "4d480f8f0c1ca3308f4c3a423ad30d5d44e9c1bf"
31 31
32DEPENDS = "qtbase qtdeclarative qtsvg hunspell" 32DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
33 33
34PACKAGECONFIG ?= "lipi-toolkit lang-all" 34PACKAGECONFIG ?= "lipi-toolkit lang-all"
35PACKAGECONFIG[t9write] = "CONFIG+=t9write"
35PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" 36PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit"
36PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" 37PACKAGECONFIG[lang-all] = "CONFIG+=lang-all"
38PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR"
39PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK"
40PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE"
41PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB"
42PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES"
43PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA"
44PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI"
45PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR"
46PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN"
47PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT"
48PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP"
49PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR"
50PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO"
51PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL"
52PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT"
53PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU"
54PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE"
55PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN"
56PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW"
37 57
38EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" 58EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}"
39EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}" 59EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}"