summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-01-05 18:30:01 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-01-05 18:30:01 (GMT)
commite93f6fa2aa832037467e335641067c69832455da (patch)
treeda3dfb2ab891de671227d26fcc246cda68bd692f /tests
parentf72165460d27860cabd51691f4d935fd74b50f80 (diff)
parent10ca680e00fe514c32eb6364c4cca3ce46814076 (diff)
downloadQt-e93f6fa2aa832037467e335641067c69832455da.zip
Qt-e93f6fa2aa832037467e335641067c69832455da.tar.gz
Qt-e93f6fa2aa832037467e335641067c69832455da.tar.bz2
Merge branch '4.5' into 4.6-staging
Diffstat (limited to 'tests')
-rw-r--r--tests/benchmarks/qhostinfo/main.cpp28
1 files changed, 15 insertions, 13 deletions
diff --git a/tests/benchmarks/qhostinfo/main.cpp b/tests/benchmarks/qhostinfo/main.cpp
index 389443b..80d0fd8 100644
--- a/tests/benchmarks/qhostinfo/main.cpp
+++ b/tests/benchmarks/qhostinfo/main.cpp
@@ -7,11 +7,11 @@
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
-** 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.
+** 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
@@ -25,19 +25,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.
+**
+**
+**
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
+
+
#include <QDebug>
#include <QHostInfo>
#include <QStringList>