aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-08-23 16:51:03 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-08-24 13:14:55 +0000
commit20e32018b7e29af39cb6315f5f6e575a662896e4 (patch)
tree38b5ea757df5b436e68dbd719a304df812926336
parent4629e81dcb8b02fd9d26437c61a4bbaaca5784f0 (diff)
qtquickcompiler: update revision
Fix for segfault Change-Id: Iab8e4551eba94635116f1adab39516b8a8e3da23 Task-number: QTBUG-55394 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, 4 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index 4b9abd85..446cca33 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 = "321c7d8bbc9e25fbb49dbba187b04916eddfdb2a"
+SRCREV = "2fb03180754aa5f9ca640e9cdd264a7a3166149b"
BRANCH = "5.6"
S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index ef784188..e697249a 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -26,6 +26,9 @@ 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"