summaryrefslogtreecommitdiffstats
path: root/conf/distro
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-06-02 12:58:54 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-06-06 12:21:53 +0000
commitf775774f21c3edbb73e19031d6d38c603f42f16b (patch)
tree5e3482d4b06b3dbfb0bff58e1e6e430fd175f83d /conf/distro
parentab47141905ed04e64160e1c24a9af603e5ecd276 (diff)
downloadmeta-boot2qt-f775774f21c3edbb73e19031d6d38c603f42f16b.tar.gz
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 <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/b2qt.conf3
1 files changed, 3 insertions, 0 deletions
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 ?= ""
68OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe" 68OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe"
69OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe" 69OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe"
70 70
71# Disable SHA validation for branch
72QT_MODULE_BRANCH = "5.6;nobranch=1"
73
71PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler" 74PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
72 75
73IMAGE_FSTYPES = "tar.gz conf" 76IMAGE_FSTYPES = "tar.gz conf"