Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

11 files changed, 103 insertions, 345 deletions

diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 9488fda..48ba8e8 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -37,12 +37,10 @@
 **
 ****************************************************************************/
 #include <QString>
-
-/*
 #ifdef QT_NETWORK_LIB
 #include <QtNetwork/QHostInfo>
 #endif
-*/
+
 
 #ifdef Q_OS_SYMBIAN
 #include <sys/socket.h>
@@ -98,9 +96,9 @@ public:
             return entry->recordValue();
         }
 #endif
-        return QString("qttest");
+        //return QString("qttest");
         //return QString("aspiriniks");
-        //return QString("qt-test-server");
+        return QString("qt-test-server");
     }
     static QString serverDomainName()
     {
@@ -112,8 +110,9 @@ public:
             return entry->recordValue();
         }
 #endif
-        return QString("it.local");
+        //return QString("it.local");
         //return QString("troll.no");
+        return QString("qt-test-net");
     }
     static QString serverName()
     {
@@ -128,10 +127,12 @@ public:
     }
     static QString wildcardServerName()
     {
-        //return "qt-test-server.wildcard.dev." + serverDomainName();
-        return "qttest.wildcard.dev." + serverDomainName();
+        return "qt-test-server.wildcard.dev." + serverDomainName();
+        //return "qttest.wildcard.dev." + serverDomainName();
     }
-    static const char *serverIP()
+    
+#ifdef QT_NETWORK_LIB
+    static QHostAddress serverIP()
     {
 #ifdef Q_OS_SYMBIAN
         loadTestSettings();
@@ -141,12 +142,13 @@ public:
             if(serverIp.isNull()) {
                 serverIp = entry->recordValue().toAscii();
             }
-            return serverIp.data();
+            return QHostAddress(serverIp.data());
         }
-#endif
-        return "10.10.14.172";
+#endif    
+        return QHostInfo::fromName(serverName()).addresses().first();
     }
-
+#endif    
+    
     static QByteArray expectedReplyIMAP()
     {
 #ifdef Q_OS_SYMBIAN
@@ -315,14 +317,6 @@ private:
     }
 #endif
 
-/*
-#ifdef QT_NETWORK_LIB
-    static QHostAddress serverIP()
-    {
-        return QHostInfo::fromName(serverName()).addresses().first();
-    }
-#endif
-*/
 
 };
 #ifdef Q_OS_SYMBIAN
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp
index c990c44..bf499ec 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp
@@ -92,6 +92,8 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
+const char * const lupinellaIp = "10.3.4.6";
+
 
 class tst_QHostInfo : public QObject
 {
@@ -216,8 +218,8 @@ void tst_QHostInfo::lookupIPv4_data()
 
 #ifdef Q_OS_SYMBIAN
     // Test server lookup
-    QTest::newRow("lookup_01") << QtNetworkSettings::serverName() << QtNetworkSettings::serverIP() << int(QHostInfo::NoError);
-    QTest::newRow("literal_ip4") << QtNetworkSettings::serverIP() << QtNetworkSettings::serverIP() << int(QHostInfo::NoError);
+    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("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/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
index 4287a16..0245e95 100644
--- a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
+++ b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
@@ -306,11 +306,11 @@ void tst_QHttpSocketEngine::simpleConnectToIMAP()
 
     socketDevice.setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, QtNetworkSettings::serverName(), 3128));
 
-    QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143));
+    QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143));
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
     QVERIFY(socketDevice.waitForWrite());
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
+    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
     QVERIFY(!socketDevice.localAddress().isNull());
     QVERIFY(socketDevice.localPort() > 0);
 
@@ -695,11 +695,11 @@ void tst_QHttpSocketEngine::passwordAuth()
 
     socketDevice.setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, QtNetworkSettings::serverName(), 3128, "qsockstest", "password"));
 
-    QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143));
+    QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143));
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
     QVERIFY(socketDevice.waitForWrite());
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
+    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
 
     // Wait for the greeting
     QVERIFY(socketDevice.waitForRead());
diff --git a/tests/auto/qkeyevent/.gitignore b/tests/auto/qkeyevent/.gitignore
deleted file mode 100644
index 8d69f55..0000000
--- a/tests/auto/qkeyevent/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tst_qkeyevent
diff --git a/tests/auto/qkeyevent/qkeyevent.pro b/tests/auto/qkeyevent/qkeyevent.pro
deleted file mode 100644
index 8a3dc12..0000000
--- a/tests/auto/qkeyevent/qkeyevent.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-HEADERS += 
-SOURCES += tst_qkeyevent.cpp 
-
-
diff --git a/tests/auto/qkeyevent/tst_qkeyevent.cpp b/tests/auto/qkeyevent/tst_qkeyevent.cpp
deleted file mode 100644
index 9adf97c..0000000
--- a/tests/auto/qkeyevent/tst_qkeyevent.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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
-** 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
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, 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 are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
-#include <qevent.h>
-#include <qapplication.h>
-
-
-#include <qevent.h>
-
-//TESTED_CLASS=
-//TESTED_FILES=gui/itemviews/qitemselectionmodel.h gui/itemviews/qitemselectionmodel.cpp
-
-class KeyEventWidget : public QWidget
-{
-public:
-    KeyEventWidget( QWidget* parent = 0, const char* name = 0 );
-    ~KeyEventWidget();
-    QKeyEvent* getLastKeyPress();
-    QKeyEvent* getLastKeyRelease();
-    bool recievedKeyPress;
-    bool recievedKeyRelease;
-protected:
-    void keyPressEvent( QKeyEvent* e );
-    void keyReleaseEvent( QKeyEvent* e );
-private:
-    QKeyEvent* lastKeyPress;
-    QKeyEvent* lastKeyRelease;
-};
-
-class tst_QKeyEvent : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QKeyEvent();
-    ~tst_QKeyEvent();
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-private slots:
-    void sendRecieveKeyEvents_data();
-    void sendRecieveKeyEvents();
-    void standardKey();
-private:
-    KeyEventWidget* testWidget;
-};
-
-
-KeyEventWidget::KeyEventWidget( QWidget* parent, const char* name )
-    : QWidget( parent ), recievedKeyPress( false ), recievedKeyRelease( false ),
-    lastKeyPress( 0 ), lastKeyRelease( 0 )
-{
-    setObjectName(name);
-}
-
-KeyEventWidget::~KeyEventWidget()
-{
-    delete lastKeyPress;
-    delete lastKeyRelease;
-}
-
-QKeyEvent* KeyEventWidget::getLastKeyPress()
-{
-    return lastKeyPress;
-}
-
-QKeyEvent* KeyEventWidget::getLastKeyRelease()
-{
-    return lastKeyRelease;
-}
-
-void KeyEventWidget::keyPressEvent( QKeyEvent* e )
-{
-    if (lastKeyPress)
-        delete lastKeyPress;
-    lastKeyPress = new QKeyEvent(*e);
-    recievedKeyPress = true;
-}
-
-void KeyEventWidget::keyReleaseEvent( QKeyEvent* e )
-{
-    if (lastKeyRelease)
-        delete lastKeyRelease;
-    lastKeyRelease = new QKeyEvent(*e);
-    recievedKeyRelease = true;
-}
-
-tst_QKeyEvent::tst_QKeyEvent()
-{
-}
-
-tst_QKeyEvent::~tst_QKeyEvent()
-{
-}
-
-void tst_QKeyEvent::initTestCase()
-{
-    testWidget = new KeyEventWidget( 0 );
-    testWidget->show();
-}
-
-void tst_QKeyEvent::cleanupTestCase()
-{
-    delete testWidget;
-}
-
-void tst_QKeyEvent::sendRecieveKeyEvents_data()
-{
-    QTest::addColumn<int>("key");
-    QTest::addColumn<bool>("textExpected");
-    QTest::addColumn<QString>("text");
-    int a;
-    for ( a = Qt::Key_Escape; a < Qt::Key_Direction_R; a++ ) {
-	if ( ( a > Qt::Key_Clear && a < Qt::Key_Home )
-	    || ( a > Qt::Key_PageDown && a < Qt::Key_Shift )
-	    || ( a > Qt::Key_ScrollLock && a < Qt::Key_F1 ) ) {
-	    // There is no representation for these values
-	    continue;
-	}
-	if ( a == Qt::Key_Backtab ) // Actually SHIFT+Tab
-	    QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << int(Qt::Key_Tab) << false << "";
-	else
-	    QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << a << false << "";
-    }
-
-    for ( a = Qt::Key_Space; a < Qt::Key_ydiaeresis; a++ ) {
-	QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << a << true << QString( QChar(a) );
-    }
-}
-
-void tst_QKeyEvent::standardKey()
-{
-
-}
-
-void tst_QKeyEvent::sendRecieveKeyEvents()
-{
-    QFETCH( int, key );
-    QFETCH( bool, textExpected );
-    QFETCH( QString, text );
-    testWidget->recievedKeyPress = false;
-
-#ifdef Q_WS_WIN
-    // Will be eaten by Windows system
-    if ( key == Qt::Key_Print )
-	return;
-
-    // This is mapped to nothing on Windows
-    if ( key == Qt::Key_SysReq )
-	return;
-
-    // Not supported on Windows
-    if ( key >= Qt::Key_F25 && key <= Qt::Key_Super_R )
-	return;
-    if ( key >= Qt::Key_Hyper_L && key <= Qt::Key_Hyper_R )
-	return;
-    if ( key == Qt::Key_Help )
-	return;
-
-    // Not sure on how to add support for these yet
-    if ( key >= Qt::Key_Direction_L && key <= Qt::Key_Direction_R )
-	return;
-
-    // Not sure on how to test these yet, since they use SHIFT etc
-    if ( key >= Qt::Key_Exclam && key <= Qt::Key_Slash )
-	return;
-    if ( key >= Qt::Key_Colon && key <= Qt::Key_At )
-	return;
-    if ( key >= Qt::Key_BracketRight && key <= Qt::Key_ydiaeresis )
-	return;
-#endif // Q_WS_WIN
-
-#ifdef Q_OS_SYMBIAN
-    // Not supported on symbian
-    if ( key == Qt::Key_Print )
-    return;
-
-    // Not supported on symbian
-    if ( key == Qt::Key_SysReq )
-    return;
-
-    // Not supported on symbian
-    if ( key >= Qt::Key_F25 && key <= Qt::Key_Super_R )
-    return;
-    if ( key >= Qt::Key_Hyper_L && key <= Qt::Key_Hyper_R )
-    return;
-    if ( key == Qt::Key_Help )
-    return;
-
-    // Not sure on how to add support for these yet
-    if ( key >= Qt::Key_Direction_L && key <= Qt::Key_Direction_R )
-    return;
-
-    // Not supported on symbian
-    if ( key >= Qt::Key_Exclam && key <= Qt::Key_Slash )
-    return;
-    if ( key >= Qt::Key_Colon && key <= Qt::Key_At )
-    return;
-    if ( key >= Qt::Key_BracketRight && key <= Qt::Key_ydiaeresis )
-    return;
-#endif // Q_WS_WIN
-
-    if ( key == Qt::Key_F1 )
-	return; // Ignore for the moment
-
-    QTest::keyPress( testWidget, (Qt::Key)key );
-    while ( !testWidget->recievedKeyPress )
-        qApp->processEvents();
-    QKeyEvent* ke = testWidget->getLastKeyPress();
-    QCOMPARE( ke->key(), key );
-    if ( textExpected )
-        QCOMPARE( ke->text(), text );
-    testWidget->recievedKeyRelease = false;
-    QTest::keyRelease( testWidget, (Qt::Key)key );
-    while ( !testWidget->recievedKeyRelease )
-        qApp->processEvents();
-    ke = testWidget->getLastKeyRelease();
-    QCOMPARE( ke->key(), key );
-    if ( textExpected )
-        QCOMPARE( ke->text(), text );
-}
-
-QTEST_MAIN(tst_QKeyEvent)
-#include "tst_qkeyevent.moc"
diff --git a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
index e9b1cce..7f571a9 100644
--- a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
+++ b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
@@ -54,34 +54,35 @@ class tst_QScopedPointer : public QObject
     Q_OBJECT
 
 private Q_SLOTS:
-    void defaultConstructor() const;
-    void dataOnDefaultConstructed() const;
-    void useSubClassInConstructor() const;
-    void dataOnValue() const;
-    void dataSignature() const;
-    void reset() const;
-    void dereferenceOperator() const;
-    void dereferenceOperatorSignature() const;
-    void pointerOperator() const;
-    void pointerOperatorSignature() const;
-    void negationOperator() const;
-    void negationOperatorSignature() const;
-    void operatorBool() const;
-    void operatorBoolSignature() const;
-    void isNull() const;
-    void isNullSignature() const;
-    void objectSize() const;
-    // TODO instansiate on const object
+    void defaultConstructor();
+    void dataOnDefaultConstructed();
+    void useSubClassInConstructor();
+    void dataOnValue();
+    void dataSignature();
+    void reset();
+    void dereferenceOperator();
+    void dereferenceOperatorSignature();
+    void pointerOperator();
+    void pointerOperatorSignature();
+    void negationOperator();
+    void negationOperatorSignature();
+    void operatorBool();
+    void operatorBoolSignature();
+    void isNull();
+    void isNullSignature();
+    void objectSize();
+    void comparison();
+    // TODO instanciate on const object
 };
 
-void tst_QScopedPointer::defaultConstructor() const
+void tst_QScopedPointer::defaultConstructor()
 {
     /* Check that the members, one, is correctly initialized. */
     QScopedPointer<int> p;
     QCOMPARE(p.data(), static_cast<int *>(0));
 }
 
-void tst_QScopedPointer::dataOnDefaultConstructed() const
+void tst_QScopedPointer::dataOnDefaultConstructed()
 {
     QScopedPointer<int> p;
 
@@ -96,13 +97,13 @@ class MySubClass : public MyClass
 {
 };
 
-void tst_QScopedPointer::useSubClassInConstructor() const
+void tst_QScopedPointer::useSubClassInConstructor()
 {
     /* Use a syntax which users typically would do. */
     QScopedPointer<MyClass> p(new MyClass());
 }
 
-void tst_QScopedPointer::dataOnValue() const
+void tst_QScopedPointer::dataOnValue()
 {
     int *const rawPointer = new int(5);
     QScopedPointer<int> p(rawPointer);
@@ -110,14 +111,14 @@ void tst_QScopedPointer::dataOnValue() const
     QCOMPARE(p.data(), rawPointer);
 }
 
-void tst_QScopedPointer::dataSignature() const
+void tst_QScopedPointer::dataSignature()
 {
     const QScopedPointer<int> p;
     /* data() should be const. */
     p.data();
 }
 
-void tst_QScopedPointer::reset() const
+void tst_QScopedPointer::reset()
 {
     /* Call reset() on a default constructed value. */
     {
@@ -171,7 +172,7 @@ public:
     }
 };
 
-void tst_QScopedPointer::dereferenceOperator() const
+void tst_QScopedPointer::dereferenceOperator()
 {
     /* Dereference a basic value. */
     {
@@ -191,7 +192,7 @@ void tst_QScopedPointer::dereferenceOperator() const
     }
 }
 
-void tst_QScopedPointer::dereferenceOperatorSignature() const
+void tst_QScopedPointer::dereferenceOperatorSignature()
 {
     /* The operator should be const. */
     {
@@ -218,7 +219,7 @@ public:
     int value;
 };
 
-void tst_QScopedPointer::pointerOperator() const
+void tst_QScopedPointer::pointerOperator()
 {
     QScopedPointer<AnyForm> p(new AnyForm());
     p->value = 5;
@@ -226,7 +227,7 @@ void tst_QScopedPointer::pointerOperator() const
     QCOMPARE(p->value, 5);
 }
 
-void tst_QScopedPointer::pointerOperatorSignature() const
+void tst_QScopedPointer::pointerOperatorSignature()
 {
     /* The operator should be const. */
     const QScopedPointer<AnyForm> p(new AnyForm);
@@ -235,7 +236,7 @@ void tst_QScopedPointer::pointerOperatorSignature() const
     QVERIFY(p->value);
 }
 
-void tst_QScopedPointer::negationOperator() const
+void tst_QScopedPointer::negationOperator()
 {
     /* Invoke on default constructed value. */
     {
@@ -250,7 +251,7 @@ void tst_QScopedPointer::negationOperator() const
     }
 }
 
-void tst_QScopedPointer::negationOperatorSignature() const
+void tst_QScopedPointer::negationOperatorSignature()
 {
     /* The signature should be const. */
     const QScopedPointer<int> p;
@@ -260,7 +261,7 @@ void tst_QScopedPointer::negationOperatorSignature() const
     static_cast<bool>(!p);
 }
 
-void tst_QScopedPointer::operatorBool() const
+void tst_QScopedPointer::operatorBool()
 {
     /* Invoke on default constructed value. */
     {
@@ -275,15 +276,15 @@ void tst_QScopedPointer::operatorBool() const
     }
 }
 
-void tst_QScopedPointer::operatorBoolSignature() const
+void tst_QScopedPointer::operatorBoolSignature()
 {
     /* The signature should be const and return bool. */
     const QScopedPointer<int> p;
 
-    static_cast<bool>(p);
+    (void)static_cast<bool>(p);
 }
 
-void tst_QScopedPointer::isNull() const
+void tst_QScopedPointer::isNull()
 {
     /* Invoke on default constructed value. */
     {
@@ -298,7 +299,7 @@ void tst_QScopedPointer::isNull() const
     }
 }
 
-void tst_QScopedPointer::isNullSignature() const
+void tst_QScopedPointer::isNullSignature()
 {
     const QScopedPointer<int> p(new int(69));
 
@@ -306,11 +307,37 @@ void tst_QScopedPointer::isNullSignature() const
     static_cast<bool>(p.isNull());
 }
 
-void tst_QScopedPointer::objectSize() const
+void tst_QScopedPointer::objectSize()
 {
     /* The size of QScopedPointer should be the same as one pointer. */
     QCOMPARE(sizeof(QScopedPointer<int>), sizeof(void *));
 }
 
+void tst_QScopedPointer::comparison()
+{
+    int *a = new int(42);
+    int *b = new int(43);
+
+    QScopedPointer<int> pa(a);
+    QScopedPointer<int> pa2(a);
+    QScopedPointer<int> pb(b);
+
+    // test equality on equal pointers
+    QVERIFY(pa == pa2);
+    QVERIFY(pa2 == pa);
+
+    // test unequality on equal pointers
+    QVERIFY(!(pa != pa2));
+    QVERIFY(!(pa2 != pa));
+
+    // test on unequal pointers
+    QVERIFY(!(pa == pb));
+    QVERIFY(!(pb == pa));
+    QVERIFY(pb != pa);
+    QVERIFY(pa != pb);
+
+    pa2.take();
+}
+
 QTEST_MAIN(tst_QScopedPointer)
 #include "tst_qscopedpointer.moc"
diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
index a6064bc..a29674f 100644
--- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -175,7 +175,7 @@ void tst_QSocketNotifier::unexpectedDisconnection()
     QVERIFY(readEnd2.state() == QAbstractSocket::ConnectedState);
 #if defined(Q_OS_WIN)
     qWarning("### Windows returns 1 activation, Unix returns 2.");
-    QCOMPARE(tester.sequence, 1);
+    QCOMPARE(tester.getSequence(), 1);
 #else
     QCOMPARE(tester.getSequence(), 2);
 #endif
diff --git a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
index d6628bd..ff78830 100644
--- a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -319,11 +319,11 @@ void tst_QSocks5SocketEngine::simpleConnectToIMAP()
 
     socketDevice.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::serverName(), 1080));
 
-    QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143));
+    QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143));
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
     QVERIFY(socketDevice.waitForWrite());
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
+    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
 
     // Wait for the greeting
     QVERIFY(socketDevice.waitForRead());
@@ -838,14 +838,14 @@ void tst_QSocks5SocketEngine::passwordAuth()
     socketDevice.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::serverName(), 1080, "qsockstest", "password"));
 
     // Connect to imap.trolltech.com's IP
-    QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143));
+    QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143));
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
     QVERIFY(socketDevice.waitForWrite());
-    if (!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143)) {
+    if (!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143)) {
         qDebug("%d, %s", socketDevice.error(), socketDevice.errorString().toLatin1().constData());
     }
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
+    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
 
     // Wait for the greeting
     QVERIFY(socketDevice.waitForRead());
@@ -904,16 +904,16 @@ void tst_QSocks5SocketEngine::passwordAuth2()
     socketDevice.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::serverName(), 1081));
     socketDevice.setReceiver(this);
 
-    QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143));
+    QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143));
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
     while (socketDevice.state() == QAbstractSocket::ConnectingState) {
         QVERIFY(socketDevice.waitForWrite());
-        socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143);
+        socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143);
     }
     if (socketDevice.state() != QAbstractSocket::ConnectedState)
         qDebug("%d, %s", socketDevice.error(), socketDevice.errorString().toLatin1().constData());
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
+    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
 
     // Wait for the greeting
     QVERIFY(socketDevice.waitForRead());
diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro
index 92700c5..cfab564 100644
--- a/tests/auto/qxmlquery/qxmlquery.pro
+++ b/tests/auto/qxmlquery/qxmlquery.pro
@@ -10,10 +10,10 @@ RESOURCES = input.qrc
 
 QT += network
 
-!wince* {
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
-} else {
-DEFINES += SRCDIR=\\\"./\\\"
+wince* {
+    DEFINES += SRCDIR=\\\"./\\\"
+} else:!symbian {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index 32e1e16..b563e06 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -65,6 +65,10 @@
 #include "TestFundament.h"
 #include "../network-settings.h"
 
+#if defined(Q_OS_SYMBIAN)
+#define SRCDIR ""
+#endif
+
 /*!
  \class tst_QXmlQuery
  \internal