aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-08-25 08:33:41 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-08-25 13:24:54 +0000
commit81c077be4feadc874a4c09b7c4bb2512ba2d85cf (patch)
treef521280096107b6ab861836cd2839612ae2436b4
parent20e32018b7e29af39cb6315f5f6e575a662896e4 (diff)
qtquickcompiler: update revision
Change-Id: Iad6d6a3015e79a4e8213f14450b08e99ea73aa24 Task-number: QTBUG-55471 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
-rw-r--r--recipes-qt/qt5/qtquickcompiler_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb3
2 files changed, 1 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index 446cca33..e0091b48 100644
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5/qtquickcompiler_git.bb
@@ -29,7 +29,7 @@ SRC_URI = " \
git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \
"
-SRCREV = "2fb03180754aa5f9ca640e9cdd264a7a3166149b"
+SRCREV = "382935b1c5c93fba9ff2f25b74ec6a5337ec62d0"
BRANCH = "5.6"
S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index e697249a..ef784188 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -26,9 +26,6 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e
inherit qt5-module qtquickcompiler
require recipes-qt/qt5/qt5-git.inc
-# Workaround for QTBUG-55471
-export QV4_NO_SSA = "1"
-
SRCREV = "68c30e00b0d9850643611d5ba9c29a247ccd44ec"
DEPENDS = "qtbase qtdeclarative qtsvg hunspell"