diff options
author | hjk <qtc-committer@nokia.com> | 2009-02-25 09:15:00 +0100 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2009-02-25 09:15:00 +0100 |
commit | 8ca887aae25dd8e4f597cf420e030e1d84352193 (patch) | |
tree | a89e8d92c59c753d9189ad85248e4fb663767c7e /src/libs/qtconcurrent/QtConcurrentTools | |
parent | 40123cdd7d5d3cda802b2e26a4be6dc2be17417e (diff) | |
download | qt-creator-8ca887aae25dd8e4f597cf420e030e1d84352193.tar.gz |
Fixes: change file license headers to include LGPL
Diffstat (limited to 'src/libs/qtconcurrent/QtConcurrentTools')
-rw-r--r-- | src/libs/qtconcurrent/QtConcurrentTools | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/src/libs/qtconcurrent/QtConcurrentTools b/src/libs/qtconcurrent/QtConcurrentTools index a60a4cdf26..28775f6407 100644 --- a/src/libs/qtconcurrent/QtConcurrentTools +++ b/src/libs/qtconcurrent/QtConcurrentTools @@ -1,35 +1,31 @@ -/*************************************************************************** +/************************************************************************** ** ** This file is part of Qt Creator ** -** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Qt Software Information (qt-info@nokia.com) ** +** Commercial Usage ** -** Non-Open Source Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** -** Licensees may use this file in accordance with the Qt Beta Version -** License Agreement, Agreement version 2.2 provided with the Software or, -** alternatively, in accordance with the terms contained in a written -** agreement between you and Nokia. +** GNU Lesser General Public License Usage ** -** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** Alternatively, this file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the packaging -** of this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. ** -** http://www.fsf.org/licensing/licenses/info/GPLv2.html and -** http://www.gnu.org/copyleft/gpl.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.3, included in the file GPL_EXCEPTION.txt in this package. -** -***************************************************************************/ +**************************************************************************/ #include "qtconcurrent/multitask.h" #include "qtconcurrent/runextensions.h" |