summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@nokia.com>2011-05-09 16:07:46 +0200
committerLeena Miettinen <riitta-leena.miettinen@nokia.com>2011-05-09 16:07:46 +0200
commit314bf30ec8f3808496f9a2ce265fd2e7401b78b1 (patch)
treebfed979be2336f85ab274c0ad802664b426e55a7
parent3e3979a1159158c28c28f4827344d32afc6fb77b (diff)
Doc: Update copyright text
-rw-r--r--doc/simulator.qdoc19
1 files changed, 7 insertions, 12 deletions
diff --git a/doc/simulator.qdoc b/doc/simulator.qdoc
index 17d6f51..a5e800f 100644
--- a/doc/simulator.qdoc
+++ b/doc/simulator.qdoc
@@ -1,30 +1,25 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
** This file is part of the documentation of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial 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.
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
**
** GNU Free Documentation License
+**
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of this
** file.
**
** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
+** Nokia at info@qt.nokia.com.
**
****************************************************************************/
+
// **********************************************************************
// NOTE: the sections are not ordered by their logical order to avoid
// reshuffling the file each time the index order changes (i.e., often).