fix license header

This commit is contained in:
hjk
2008-12-16 17:25:01 +01:00
parent da3cb14483
commit 06e5e83e1e
2 changed files with 21 additions and 23 deletions

View File

@@ -1,34 +1,35 @@
/**************************************************************************** /***************************************************************************
**
** This file is part of Qt Creator ** This file is part of Qt Creator
** **
** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).* ** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
** **
** Contact: Qt Software Information (qt-info@nokia.com)** ** Contact: Qt Software Information (qt-info@nokia.com)
** **
** No Commercial Usage **
** This file contains pre-release code and may only be used for evaluation ** Non-Open Source Usage
** and testing purposes. It may not be used for commercial development. You **
** may use this file in accordance with the terms and conditions contained in ** Licensees may use this file in accordance with the Qt Beta Version
** the either Technology Preview License Agreement or the Beta Release ** License Agreement, Agreement version 2.2 provided with the Software or,
** License Agreement. ** alternatively, in accordance with the terms contained in a written
** agreement between you and Nokia.
** **
** GNU General Public License Usage ** GNU General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU General ** 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 ** 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 ** Foundation and appearing in the file LICENSE.GPL included in the packaging
** of this file. Please review the following information to ensure GNU ** of this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met: ** General Public Licensing requirements will be met:
** 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.2, included in the file
** GPL_EXCEPTION.txt in this package.
** **
** If you have questions regarding the use of this file, please contact Nokia ** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** at qt-info@nokia.com ** 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 <qglobal.h> #include <qglobal.h>
@@ -2497,6 +2498,3 @@ void qDumpObjectData440(
qDebug() << "Unsupported protocol version" << protocolVersion; qDebug() << "Unsupported protocol version" << protocolVersion;
} }
} }
// ]})

View File

@@ -1,4 +1,4 @@
/*************************************************************************** /***************************************************************************
** **
** This file is part of Qt Creator ** This file is part of Qt Creator
** **