summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-09-15 16:14:10 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-09-16 15:26:18 +0000
commitfb9daa75f36127475f369271e221f7de0b0d07f6 (patch)
tree64b9ca171ef1fc695825e9649289a726eba4a06c
parent6cd6f2ce1961274873b1f8337139a3134d4179f5 (diff)
downloadmeta-boot2qt-fb9daa75f36127475f369271e221f7de0b0d07f6.tar.gz
qt5-addons: update source revisions
Quick Compiler no longer needs license checker from qtsdk. qt5-module now includes more paths for VKB Change-Id: Ic1027b836157d7fb7fc6fdc90ece7a0354497230 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
-rw-r--r--recipes-qt/qt5-addons/qtquick2drenderer.bb4
-rw-r--r--recipes-qt/qt5-addons/qtquickcompiler_3.0.bb11
-rw-r--r--recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb10
3 files changed, 9 insertions, 16 deletions
diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb
index 24aff5c..13b6b72 100644
--- a/recipes-qt/qt5-addons/qtquick2drenderer.bb
+++ b/recipes-qt/qt5-addons/qtquick2drenderer.bb
@@ -30,8 +30,8 @@ SRC_URI = " \
30 git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \ 30 git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \
31 " 31 "
32 32
33# v1.1 33# v1.1.1
34SRCREV = "97c310f3a18a5aaebf8c102ceaba1f6a093faf6b" 34SRCREV = "d7de74d6e608fbbd36fc9abad27fa82d095cb692"
35BRANCH = "master" 35BRANCH = "master"
36 36
37S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
index 6f9fa30..9c3d43b 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
@@ -27,15 +27,12 @@ LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca
27inherit qt5-module 27inherit qt5-module
28 28
29SRC_URI = " \ 29SRC_URI = " \
30 git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;name=compiler;destsuffix=git \ 30 git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;destsuffix=git \
31 git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \
32 " 31 "
33 32
34SRCREV_compiler = "cc3b348065e84242d772d53b5f9dcad88b0da33e" 33# v3.0.0
35BRANCH_compiler = "3.0" 34SRCREV = "7e29e55c8315cc5e944505f13c24893d0f54efeb"
36 35BRANCH = "3.0"
37SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea"
38BRANCH_sdk = "master"
39 36
40S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
41 38
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
index 036a938..e1aa642 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
@@ -30,16 +30,12 @@ SRC_URI = " \
30 git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \ 30 git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \
31 " 31 "
32 32
33# v1.3.0 33# v1.3.1
34SRCREV = "ad517b66fc4aadb2807951f182552a1b161d9c95" 34SRCREV = "567e2c1d3df5a841160b2c24a390f153b25ad368"
35BRANCH = "master" 35BRANCH = "1.3"
36 36
37S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
38 38
39DEPENDS = "qtbase qtdeclarative hunspell" 39DEPENDS = "qtbase qtdeclarative hunspell"
40 40
41EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop" 41EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop"
42
43FILES_${PN}-qmlplugins-dbg = " \
44 ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/VirtualKeyboard/Styles/.debug/* \
45 "