From a07f521f9bfa535ad18cbdd93e228276133ff4d9 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 Sep 2017 13:26:23 +0200 Subject: Fix outdated BSD license header Use new version with commercial exception. Change-Id: I20b377176e99b80db47f41596d20192ae7d5564f Reviewed-by: Friedemann Kleint --- src/activeqt/control/qaxaggregated.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/activeqt/control/qaxaggregated.cpp') diff --git a/src/activeqt/control/qaxaggregated.cpp b/src/activeqt/control/qaxaggregated.cpp index 6ce27a5..61e858b 100644 --- a/src/activeqt/control/qaxaggregated.cpp +++ b/src/activeqt/control/qaxaggregated.cpp @@ -6,7 +6,17 @@ ** This file is part of the ActiveQt framework 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