summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-12 08:48:28 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-12 08:48:28 (GMT)
commit6383349c11fdff670a0244edb16fd7b7750a4e62 (patch)
tree3dd191080920a775de643d96d9fd7bae402dfb84 /tests
parentbceb9733ceae86612adb622d88d6681a13ccd52c (diff)
downloadQt-6383349c11fdff670a0244edb16fd7b7750a4e62.zip
Qt-6383349c11fdff670a0244edb16fd7b7750a4e62.tar.gz
Qt-6383349c11fdff670a0244edb16fd7b7750a4e62.tar.bz2
Fixed QtNetwork autotest build breaks for Symbian.
Also updated QtNetwork auto test category file.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/_Categories/QtNetwork.txt2
-rw-r--r--tests/auto/qhostinfo/tst_qhostinfo.cpp4
-rw-r--r--tests/auto/qsslsocket/tst_qsslsocket.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/_Categories/QtNetwork.txt b/tests/auto/_Categories/QtNetwork.txt
index f08cfc9..30645d7 100644
--- a/tests/auto/_Categories/QtNetwork.txt
+++ b/tests/auto/_Categories/QtNetwork.txt
@@ -1,4 +1,4 @@
-_networkselftest
+networkselftest
#qsocketnotifier
qabstractnetworkcache
qabstractsocket
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp
index bf499ec..9943414 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp
@@ -14,7 +14,7 @@
**
** 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
+** General Public License version 2.1 as published by Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
@@ -219,7 +219,7 @@ void tst_QHostInfo::lookupIPv4_data()
#ifdef Q_OS_SYMBIAN
// Test server lookup
QTest::newRow("lookup_01") << QtNetworkSettings::serverName() << QtNetworkSettings::serverIP().toString() << int(QHostInfo::NoError);
- QTest::newRow("literal_ip4") << QtNetworkSettings::serverIP() << QtNetworkSettings::serverIP().toString() << int(QHostInfo::NoError);
+ QTest::newRow("literal_ip4") << QtNetworkSettings::serverIP().toString() << QtNetworkSettings::serverIP().toString() << int(QHostInfo::NoError);
QTest::newRow("multiple_ip4") << "multi.dev.troll.no" << "1.2.3.4 1.2.3.5 10.3.3.31" << int(QHostInfo::NoError);
#else
QTest::newRow("empty") << "" << "" << int(QHostInfo::HostNotFound);
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 12e8f1b..05b0794 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -626,7 +626,7 @@ void tst_QSslSocket::connectToHostEncryptedWithVerificationPeerName()
socket->addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
#ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
- connect(&socket, SIGNAL(sslErrors(QList<QSslError>)),
+ connect(socket, SIGNAL(sslErrors(QList<QSslError>)),
this, SLOT(untrustedWorkaroundSlot(QList<QSslError>)));
#endif