1 files changed, 20 insertions, 9 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 22bbbe1..4ba9d87 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/poky.conf
 
@@ -34,6 +42,7 @@ MAINTAINER = "B2Qt <b2qt@qt.io>"
 
 SANITY_TESTED_DISTROS += " \
             Ubuntu 11.04 \n \
+            Ubuntu-15.10 \n \
             LinuxMint-14 \n \
             LinuxMint-16 \n \
             LinuxMint-17.1 \n \
@@ -45,7 +54,9 @@ DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost
 POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
 
-# backport from oe/master, needed by meta-qt5
+FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
+
+# backport from oe/krogoth, needed by meta-qt5
 PACKAGECONFIG_CONFARGS += "${EXTRA_OECONF}"
 
 # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
@@ -69,7 +80,7 @@ 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"
+QT_MODULE_BRANCH_PARAM = "nobranch=1"
 
 PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"