summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2011-04-14 13:58:25 +0200
committerThierry Bastian <thierry.bastian@nokia.com>2011-05-12 15:43:54 +0200
commit1ce725cb60358a31b1107ab5c892abb7ceca8453 (patch)
tree1f0921182d4ae2f93883a9b6e06512c12c9e6e15 /src/gui/itemviews
parent1f806aa1b40db276dad359863d018171080d93f9 (diff)
Fix licence headers again for MR 900
See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Trust me (cherry picked from commit 7b6a7f475119878681c9d0c06b29896ec3fe72c3)
Diffstat (limited to 'src/gui/itemviews')
-rw-r--r--src/gui/itemviews/qidentityproxymodel.cpp21
-rw-r--r--src/gui/itemviews/qidentityproxymodel.h20
2 files changed, 21 insertions, 20 deletions
diff --git a/src/gui/itemviews/qidentityproxymodel.cpp b/src/gui/itemviews/qidentityproxymodel.cpp
index 9396e6199a..fcc0504388 100644
--- a/src/gui/itemviews/qidentityproxymodel.cpp
+++ b/src/gui/itemviews/qidentityproxymodel.cpp
@@ -20,20 +20,21 @@
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** 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.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
**
-** 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"
#ifndef QT_NO_IDENTITYPROXYMODEL
diff --git a/src/gui/itemviews/qidentityproxymodel.h b/src/gui/itemviews/qidentityproxymodel.h
index b60aa0b7c9..9845533b15 100644
--- a/src/gui/itemviews/qidentityproxymodel.h
+++ b/src/gui/itemviews/qidentityproxymodel.h
@@ -20,17 +20,17 @@
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** 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.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
**
-** 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$
**
****************************************************************************/