From f775774f21c3edbb73e19031d6d38c603f42f16b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 2 Jun 2016 12:58:54 +0300 Subject: qt5: update submodules and meta-qt5 Disable SHA checking for Qt modules, so we can use sha1s from the release branch without breaking build after release. Change-Id: I97b4d29fdbaceea9529fa2550564951f2186435f Reviewed-by: Teemu Holappa --- conf/distro/b2qt.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'conf') diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 8b38faa..946e238 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -68,6 +68,9 @@ MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe" OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe" +# Disable SHA validation for branch +QT_MODULE_BRANCH = "5.6;nobranch=1" + PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler" IMAGE_FSTYPES = "tar.gz conf" -- cgit v1.2.3-54-g00ecf