From fb9daa75f36127475f369271e221f7de0b0d07f6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 15 Sep 2015 16:14:10 +0300 Subject: 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 --- recipes-qt/qt5-addons/qtquick2drenderer.bb | 4 ++-- recipes-qt/qt5-addons/qtquickcompiler_3.0.bb | 11 ++++------- recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 10 +++------- 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 = " \ git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \ " -# v1.1 -SRCREV = "97c310f3a18a5aaebf8c102ceaba1f6a093faf6b" +# v1.1.1 +SRCREV = "d7de74d6e608fbbd36fc9abad27fa82d095cb692" BRANCH = "master" S = "${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 inherit qt5-module SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;name=compiler;destsuffix=git \ - git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \ + git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;destsuffix=git \ " -SRCREV_compiler = "cc3b348065e84242d772d53b5f9dcad88b0da33e" -BRANCH_compiler = "3.0" - -SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea" -BRANCH_sdk = "master" +# v3.0.0 +SRCREV = "7e29e55c8315cc5e944505f13c24893d0f54efeb" +BRANCH = "3.0" S = "${WORKDIR}/git" 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 = " \ git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \ " -# v1.3.0 -SRCREV = "ad517b66fc4aadb2807951f182552a1b161d9c95" -BRANCH = "master" +# v1.3.1 +SRCREV = "567e2c1d3df5a841160b2c24a390f153b25ad368" +BRANCH = "1.3" S = "${WORKDIR}/git" DEPENDS = "qtbase qtdeclarative hunspell" EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop" - -FILES_${PN}-qmlplugins-dbg = " \ - ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/VirtualKeyboard/Styles/.debug/* \ - " -- cgit v1.2.3-54-g00ecf