From 71404b0be1468fbf53d2ffb11f9f513371f9b1c5 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 13 Jan 2016 14:55:34 +0200 Subject: Add new license header templates and license files From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Added new header templates and corresponding license files. Unnecessary ones will be removed later when license header change is done to all Qt modules Change-Id: I8c482d81e40c03f0c6395e437f55527617aa6b58 Reviewed-by: Tuukka Turunen Reviewed-by: Iikka Eklund Reviewed-by: Lars Knoll --- header.BSD | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'header.BSD') diff --git a/header.BSD b/header.BSD index bbd476dc22..aa400a469d 100644 --- a/header.BSD +++ b/header.BSD @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the FOO module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are -- cgit v1.2.3