feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Licensing: Fix license on sshlogging* files

Browse Source 
Change-Id: Iabbf6bfdc567134b71ad5c0b5cb8a8f561cfb595
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-01-20 11:40:06 +01:00
parent e2a3678dd7
commit dd457d2811
2 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libs/ssh/sshlogging.cpp
View File

@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing ** Contact: https://www.qt.io/licensing/
** **
** This file is part of Qt Creator. ** This file is part of Qt Creator.
** **
@@ -9,22 +9,17 @@
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms and ** a written agreement between you and The Qt Company. For licensing terms
** conditions see http://www.qt.io/terms-conditions. For further information ** and conditions see https://www.qt.io/terms-conditions. For further
** use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
** **
** GNU Lesser General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.1 or version 3 as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.LGPLv21 and ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** LICENSE.LGPLv3 included in the packaging of this file. Please review the ** included in the packaging of this file. Please review the following
** following information to ensure the GNU Lesser General Public License ** information to ensure the GNU General Public License requirements will
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** **
****************************************************************************/ ****************************************************************************/

27
src/libs/ssh/sshlogging_p.h
View File

@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing ** Contact: https://www.qt.io/licensing/
** **
** This file is part of Qt Creator. ** This file is part of Qt Creator.
** **
@@ -9,22 +9,17 @@
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms and ** a written agreement between you and The Qt Company. For licensing terms
** conditions see http://www.qt.io/terms-conditions. For further information ** and conditions see https://www.qt.io/terms-conditions. For further
** use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
** **
** GNU Lesser General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.1 or version 3 as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.LGPLv21 and ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** LICENSE.LGPLv3 included in the packaging of this file. Please review the ** included in the packaging of this file. Please review the following
** following information to ensure the GNU Lesser General Public License ** information to ensure the GNU General Public License requirements will
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** **
****************************************************************************/ ****************************************************************************/