summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-04-14 15:30:34 +0200
committerThierry Bastian <thierry.bastian@nokia.com>2011-05-12 15:48:46 +0200
commit446a7ba4ff1bbb3aeafb86eb318aa5f34f327edd (patch)
treee18dd6242077336d0aefb5de64fdf4c7b436e5b9
parentf76acd935da496d161916dd6b12015b76a8d881e (diff)
Fix licence headers again for MR 900
See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Gabriel de Dietrich (cherry picked from commit bc16ebdb7aeff70fe8149297183636ea7fd14ed1)
-rw-r--r--doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp4
-rw-r--r--src/gui/itemviews/qidentityproxymodel.cpp14
-rw-r--r--src/gui/itemviews/qidentityproxymodel.h13
3 files changed, 19 insertions, 12 deletions
diff --git a/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp b/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
index 8bd65208cb..6bf6c895f6 100644
--- a/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
+++ b/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
@@ -1,8 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2011 Klarälvdalens Datakonsult AB,
-** a KDAB Group company, info@kdab.com,
-** author Stephen Kelly <stephen.kelly@kdab.com>
+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/src/gui/itemviews/qidentityproxymodel.cpp b/src/gui/itemviews/qidentityproxymodel.cpp
index fcc0504388..60f7d98bd8 100644
--- a/src/gui/itemviews/qidentityproxymodel.cpp
+++ b/src/gui/itemviews/qidentityproxymodel.cpp
@@ -1,13 +1,18 @@
/****************************************************************************
**
-** Copyright (C) 2011 Klarälvdalens Datakonsult AB,
-** a KDAB Group company, info@kdab.com,
-** author Stephen Kelly <stephen.kelly@kdab.com>
+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
** 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.
**
+** $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
** 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
@@ -34,7 +39,6 @@
**
****************************************************************************/
-
#include "qidentityproxymodel.h"
#ifndef QT_NO_IDENTITYPROXYMODEL
diff --git a/src/gui/itemviews/qidentityproxymodel.h b/src/gui/itemviews/qidentityproxymodel.h
index 9845533b15..4b3176a5b5 100644
--- a/src/gui/itemviews/qidentityproxymodel.h
+++ b/src/gui/itemviews/qidentityproxymodel.h
@@ -1,13 +1,18 @@
/****************************************************************************
**
-** Copyright (C) 2011 Klarälvdalens Datakonsult AB,
-** a KDAB Group company, info@kdab.com,
-** author Stephen Kelly <stephen.kelly@kdab.com>
+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
** 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.
**
+** $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
** 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