1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix licence headers again for MR 900

Browse Source 
See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2

Reviewed-by: Trust me
(cherry picked from commit 7b6a7f475119878681c9d0c06b29896ec3fe72c3)
This commit is contained in:
Gabriel de Dietrich 2011-04-14 13:58:25 +02:00 committed by Thierry Bastian
parent 1f806aa1b4
commit 1ce725cb60
3 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/itemviews/qidentityproxymodel.cpp
View File

@ -20,20 +20,21 @@
** rights. These rights are described in the Nokia Qt LGPL Exception ** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** **
** GNU General Public License Usage ** If you have questions regarding the use of this file, please contact
** Alternatively, this file may be used under the terms of the GNU General ** Nokia at qt-info@nokia.com.
** Public License version 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 the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
** **
** Other Usage **
** Alternatively, this file may be used in accordance with the terms and **
** conditions contained in a signed written agreement between you and Nokia. **
**
**
**
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#include "qidentityproxymodel.h" #include "qidentityproxymodel.h"
#ifndef QT_NO_IDENTITYPROXYMODEL #ifndef QT_NO_IDENTITYPROXYMODEL

20
src/gui/itemviews/qidentityproxymodel.h
View File

@ -20,17 +20,17 @@
** rights. These rights are described in the Nokia Qt LGPL Exception ** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** **
** GNU General Public License Usage ** If you have questions regarding the use of this file, please contact
** Alternatively, this file may be used under the terms of the GNU General ** Nokia at qt-info@nokia.com.
** Public License version 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 the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
** **
** Other Usage **
** Alternatively, this file may be used in accordance with the terms and **
** conditions contained in a signed written agreement between you and Nokia. **
**
**
**
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

33
tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
View File

@ -1,13 +1,18 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2011 Klarälvdalens Datakonsult AB, ** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
** a KDAB Group company, info@kdab.com,
** author Stephen Kelly <stephen.kelly@kdab.com>
** All rights reserved. ** All rights reserved.
** Contact: Nokia Corporation (info@qt.nokia.com) ** Contact: Nokia Corporation (qt-info@nokia.com)
** **
** This file is part of the QtGui module of the Qt Toolkit. ** This file is part of the QtGui module of the Qt Toolkit.
** **
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage ** GNU Lesser 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 Lesser
** General Public License version 2.1 as published by the Free Software ** General Public License version 2.1 as published by the Free Software
@ -20,17 +25,17 @@
** rights. These rights are described in the Nokia Qt LGPL Exception ** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** **
** GNU General Public License Usage ** If you have questions regarding the use of this file, please contact
** Alternatively, this file may be used under the terms of the GNU General ** Nokia at qt-info@nokia.com.
** Public License version 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 the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
** **
** Other Usage **
** Alternatively, this file may be used in accordance with the terms and **
** conditions contained in a signed written agreement between you and Nokia. **
**
**
**
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/