From 882f407f2a48c59774eb07f3f91d3b26a40e9998 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 11 Aug 2009 13:53:13 +0300 Subject: Removed unneccessary QHostAddress cast from tst_qnativesocketengine.cpp The cast/constructor is not needed anymore due to commit 5b80fbad. --- tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp index be0bfe3..dfc6b78 100644 --- a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp +++ b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp @@ -153,14 +153,14 @@ void tst_QNativeSocketEngine::simpleConnectToIMAP() QVERIFY(socketDevice.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol)); QVERIFY(socketDevice.state() == QAbstractSocket::UnconnectedState); - const bool isConnected = socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143); + const bool isConnected = socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143); if (!isConnected) { QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState); QVERIFY(socketDevice.waitForWrite()); QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState); } QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState); - QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP())); + QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP()); // Wait for the greeting QVERIFY(socketDevice.waitForRead()); @@ -592,7 +592,7 @@ void tst_QNativeSocketEngine::networkError() QVERIFY(client.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol)); - const bool isConnected = client.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143); + const bool isConnected = client.connectToHost(QtNetworkSettings::serverIP(), 143); if (!isConnected) { QVERIFY(client.state() == QAbstractSocket::ConnectingState); QVERIFY(client.waitForWrite()); -- cgit v0.12 From 212ce398cf5441e7c16cb45a1c8f18d4c58a4870 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 11 Aug 2009 13:55:04 +0300 Subject: Fixed qpropertyanimation autotest build for win32-msvc2008. --- tests/auto/qpropertyanimation/qpropertyanimation.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qpropertyanimation/qpropertyanimation.pro b/tests/auto/qpropertyanimation/qpropertyanimation.pro index 9199ac3..6d6ddbf 100644 --- a/tests/auto/qpropertyanimation/qpropertyanimation.pro +++ b/tests/auto/qpropertyanimation/qpropertyanimation.pro @@ -1,5 +1,5 @@ load(qttest_p4) -QT = core +QT = core gui SOURCES += tst_qpropertyanimation.cpp -- cgit v0.12 From a6ed9f9a03817adc598fd61adeda08f17a504ea3 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 11 Aug 2009 15:06:10 +0300 Subject: Fixed qline autotest merge, tst_qline.cpp was added twice to SOURCES. --- tests/auto/qline/qline.pro | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/auto/qline/qline.pro b/tests/auto/qline/qline.pro index 715774a..1a3d7f2 100644 --- a/tests/auto/qline/qline.pro +++ b/tests/auto/qline/qline.pro @@ -1,5 +1,4 @@ load(qttest_p4) -SOURCES += tst_qline.cpp QT -= gui SOURCES += tst_qline.cpp unix:!mac:!symbian*:!vxworks:LIBS+=-lm -- cgit v0.12 From 8f10c91b2fc5ccc2ffaca64db2fbb7e009bd5ae4 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 11 Aug 2009 15:12:07 +0300 Subject: Fixed qlocale autotest compile error for Symbian. --- tests/auto/qlocale/tst_qlocale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index 6301d40..1d7e67d 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -2042,7 +2042,7 @@ void tst_QLocale::symbianSystemLocale() TBuf<50> s60FormattedDate; TRAPD(err, s60Date.FormatL(s60FormattedDate, s60DateFormat)); QVERIFY(err == KErrNone); - QString s60FinalResult = qt_TDes2QStringL(s60FormattedDate); + QString s60FinalResult = qt_TDesC2QString(s60FormattedDate); QString finalResult = date.toString(dateFormat); QCOMPARE(finalResult, s60FinalResult); -- cgit v0.12 From 05b9ac1574ec8333d4b156973766d995b6a9b1e4 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 11 Aug 2009 16:06:56 +0300 Subject: Fixed qstatemachine autotest compilaton for Symbian OS. Apparently Nokia X86 compiler is not able to use templated qCompare when given arguments have different different type but same base class. This error should be isolated and reported to Nokia X86 team. See task: 259508 --- tests/auto/qstatemachine/tst_qstatemachine.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp index 41347eb..3add362 100644 --- a/tests/auto/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp @@ -274,7 +274,7 @@ void tst_QStateMachine::transitionToRootState() QAbstractTransition *trans = initialState->addTransition(new EventTransition(QEvent::User, &machine)); QVERIFY(trans != 0); QCOMPARE(trans->sourceState(), initialState); - QCOMPARE(trans->targetState(), &machine); + QCOMPARE(trans->targetState(), static_cast(&machine)); machine.start(); QCoreApplication::processEvents(); @@ -295,9 +295,9 @@ void tst_QStateMachine::transitionFromRootState() QState *root = &machine; QState *s1 = new QState(root); EventTransition *trans = new EventTransition(QEvent::User, s1); - QCOMPARE(root->addTransition(trans), trans); + QCOMPARE(root->addTransition(trans), static_cast(trans)); QCOMPARE(trans->sourceState(), root); - QCOMPARE(trans->targetState(), s1); + QCOMPARE(trans->targetState(), static_cast(s1)); } void tst_QStateMachine::transitionEntersParent() @@ -1024,11 +1024,11 @@ void tst_QStateMachine::rootState() QCOMPARE(machine.machine(), (QStateMachine*)0); QState *s1 = new QState(&machine); - QCOMPARE(s1->parentState(), &machine); + QCOMPARE(s1->parentState(), static_cast(&machine)); QState *s2 = new QState(); s2->setParent(&machine); - QCOMPARE(s2->parentState(), &machine); + QCOMPARE(s2->parentState(), static_cast(&machine)); } void tst_QStateMachine::addAndRemoveState() @@ -1045,8 +1045,8 @@ void tst_QStateMachine::addAndRemoveState() QCOMPARE(s1->parentState(), (QState*)0); QCOMPARE(s1->machine(), (QStateMachine*)0); machine.addState(s1); - QCOMPARE(s1->machine(), &machine); - QCOMPARE(s1->parentState(), &machine); + QCOMPARE(s1->machine(), static_cast(&machine)); + QCOMPARE(s1->parentState(), static_cast(&machine)); QCOMPARE(root_d->childStates().size(), 1); QCOMPARE(root_d->childStates().at(0), (QAbstractState*)s1); @@ -1056,7 +1056,7 @@ void tst_QStateMachine::addAndRemoveState() QState *s2 = new QState(); QCOMPARE(s2->parentState(), (QState*)0); machine.addState(s2); - QCOMPARE(s2->parentState(), &machine); + QCOMPARE(s2->parentState(), static_cast(&machine)); QCOMPARE(root_d->childStates().size(), 2); QCOMPARE(root_d->childStates().at(0), (QAbstractState*)s1); QCOMPARE(root_d->childStates().at(1), (QAbstractState*)s2); -- cgit v0.12