diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-05 15:24:53 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-05 15:24:53 +0000 |
commit | df5159a8a6b6bf585feb1473054dec2ed5ddb11a (patch) | |
tree | a56ad5c69e735eeeb1e93e01330ec2498f5ba497 /examples/network/torrent/mainwindow.h | |
parent | 0683c9291f9c1ffe0625fdadee198840047f0e92 (diff) | |
parent | f2856875843efce9a00e90dad05bde358ab82197 (diff) |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'examples/network/torrent/mainwindow.h')
-rw-r--r-- | examples/network/torrent/mainwindow.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/network/torrent/mainwindow.h b/examples/network/torrent/mainwindow.h index 013275bce5..7c18f770f8 100644 --- a/examples/network/torrent/mainwindow.h +++ b/examples/network/torrent/mainwindow.h @@ -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 examples 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 |