diff options
Diffstat (limited to 'tests/auto/network/kernel/qhostinfo')
-rw-r--r-- | tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp | 52 |
1 files changed, 14 insertions, 38 deletions
diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index 5f0addba98..13d4442ada 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -1,31 +1,27 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2016 Intel Corporation. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** -** 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 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company 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 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -92,17 +88,9 @@ class tst_QHostInfo : public QObject { Q_OBJECT -public: - tst_QHostInfo(); - virtual ~tst_QHostInfo(); - - -public slots: +private slots: void init(); - void cleanup(); void initTestCase(); - -private slots: void getSetCheck(); void staticInformation(); void lookupIPv4_data(); @@ -169,14 +157,6 @@ void tst_QHostInfo::staticInformation() qDebug() << "Domain name:" << QHostInfo::localDomainName(); } -tst_QHostInfo::tst_QHostInfo() -{ -} - -tst_QHostInfo::~tst_QHostInfo() -{ -} - void tst_QHostInfo::initTestCase() { QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); @@ -237,10 +217,6 @@ void tst_QHostInfo::init() qt_qhostinfo_enable_cache(cache); } -void tst_QHostInfo::cleanup() -{ -} - void tst_QHostInfo::lookupIPv4_data() { QTest::addColumn<QString>("hostname"); |