summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/qstringlist
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-06-16 12:08:09 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-06-16 12:08:09 (GMT)
commit858c70f768eeb2d65cefd4115f4e9089b588b2d0 (patch)
treeae24d25b16318a3c479c30096985f4aac4bd2ff3 /tests/benchmarks/qstringlist
parent7f00209fe9face275e068d889973aa943cdfcb00 (diff)
downloadQt-858c70f768eeb2d65cefd4115f4e9089b588b2d0.zip
Qt-858c70f768eeb2d65cefd4115f4e9089b588b2d0.tar.gz
Qt-858c70f768eeb2d65cefd4115f4e9089b588b2d0.tar.bz2
Update license headers as requested by the marketing department.
Reviewed-by: Trust Me
Diffstat (limited to 'tests/benchmarks/qstringlist')
-rw-r--r--tests/benchmarks/qstringlist/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarks/qstringlist/main.cpp b/tests/benchmarks/qstringlist/main.cpp
index ce03caa..e9f873d 100644
--- a/tests/benchmarks/qstringlist/main.cpp
+++ b/tests/benchmarks/qstringlist/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the test suite of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
it/tools/assistant?h=v4.8.3&id=b914c388a809c17e4f76a4dcc1d3a1006e13c115'>Merge branch '4.5'Thiago Macieira2009-06-261-1/+1 |\ \ | |/ | * Bump Qt version number.Jason McDonald2009-06-251-1/+1 * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-2315-1/+16 |\ \ | |/ | * Fix missing member initialization.kh2009-06-2315-1/+16 * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-185-118/+104 |\ \ | |/ | * Make it possible to drag bookmarks to the root item.kh2009-06-181-1/+2 | * Cleanup.kh2009-06-182-117/+99 | * Add Russian translation for Qt Assistant.Ritt Konstantin2009-06-172-0/+2 | * Add Russian translation for QtHelp.Ritt Konstantin2009-06-171-0/+1 * | Merge license header changes from 4.5Volker Hilsheimer2009-06-16