From eff4b1c979a42cb2fa7a5a7bbb2cb74f7524e61c Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Fri, 21 Aug 2009 13:28:45 +0200 Subject: Rebuild configure.exe. This binary was built with MSVC2008 and the /MT option. --- configure.exe | Bin 1167872 -> 1165824 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/configure.exe b/configure.exe index 659f744..4c095d2 100755 Binary files a/configure.exe and b/configure.exe differ -- cgit v0.12 From 80ba609f408fc1d2b12699ce3679f3a96b9b2565 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Fri, 21 Aug 2009 13:47:53 +0200 Subject: Revisiting test cases. Some values (timeouts) could be trimmed to be the same as on the other platforms. Others are different as we have to remember that Symbina is embedded pltform and that usually tests run in the emulator. Things need more time then. Reviewed-by: TrustMe --- tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 80 +++++++++++--------------- 1 file changed, 32 insertions(+), 48 deletions(-) diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 9d05fb8..645734e 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -523,16 +523,19 @@ public: QTcpSocket *active = new QTcpSocket(this); active->connectToHost("127.0.0.1", server.serverPort()); #ifndef Q_OS_SYMBIAN - if (!active->waitForConnected(100)) + // need more time as working with embedded + // device and testing from emualtor + // things tend to get slower + if (!active->waitForConnected(1000)) return false; - if (!server.waitForNewConnection(100)) + if (!server.waitForNewConnection(1000)) return false; #else - if (!active->waitForConnected(5000)) + if (!active->waitForConnected(100)) return false; - if (!server.waitForNewConnection(5000)) + if (!server.waitForNewConnection(100)) return false; #endif QTcpSocket *passive = server.nextPendingConnection(); @@ -1823,11 +1826,7 @@ void tst_QNetworkReply::ioGetFromFtp() DataReader reader(reply); connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); -#ifdef Q_OS_SYMBIAN - QTestEventLoop::instance().enterLoop(20); -#else QTestEventLoop::instance().enterLoop(10); -#endif QVERIFY(!QTestEventLoop::instance().timeout()); QCOMPARE(reply->url(), request.url()); @@ -1857,19 +1856,11 @@ void tst_QNetworkReply::ioGetFromFtpWithReuse() QSignalSpy spy(reply1, SIGNAL(finished())); connect(reply2, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); -#ifdef Q_OS_SYMBIAN - QTestEventLoop::instance().enterLoop(20); -#else QTestEventLoop::instance().enterLoop(10); -#endif QVERIFY(!QTestEventLoop::instance().timeout()); if (spy.count() == 0) { connect(reply1, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); -#ifdef Q_OS_SYMBIAN - QTestEventLoop::instance().enterLoop(20); -#else QTestEventLoop::instance().enterLoop(10); -#endif QVERIFY(!QTestEventLoop::instance().timeout()); } @@ -2560,12 +2551,7 @@ void tst_QNetworkReply::ioGetWithManyProxies() connect(&manager, SIGNAL(sslErrors(QNetworkReply*,QList)), SLOT(sslErrors(QNetworkReply*,QList))); #endif - -#ifndef Q_OS_SYMBIAN QTestEventLoop::instance().enterLoop(10); -#else - QTestEventLoop::instance().enterLoop(60); -#endif QVERIFY(!QTestEventLoop::instance().timeout()); manager.disconnect(SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), @@ -2694,13 +2680,8 @@ void tst_QNetworkReply::ioPutToFileFromLocalSocket() } QLocalSocket active; active.connectToServer(socketname); -#ifndef Q_OS_SYMBIAN QVERIFY2(server.waitForNewConnection(10), server.errorString().toLatin1().constData()); QVERIFY2(active.waitForConnected(10), active.errorString().toLatin1().constData()); -#else - QVERIFY2(server.waitForNewConnection(5000), server.errorString().toLatin1().constData()); - QVERIFY2(active.waitForConnected(5000), active.errorString().toLatin1().constData()); -#endif QVERIFY2(server.hasPendingConnections(), server.errorString().toLatin1().constData()); QLocalSocket *passive = server.nextPendingConnection(); @@ -2715,11 +2696,7 @@ void tst_QNetworkReply::ioPutToFileFromLocalSocket() passive->setParent(reply); connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); -#ifndef Q_OS_SYMBIAN QTestEventLoop::instance().enterLoop(10); -#else - QTestEventLoop::instance().enterLoop(30); -#endif QVERIFY(!QTestEventLoop::instance().timeout()); QCOMPARE(reply->url(), url); @@ -2982,7 +2959,11 @@ void tst_QNetworkReply::ioPostToHttpFromSocket() QSignalSpy authenticationRequiredSpy(&manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*))); QSignalSpy proxyAuthenticationRequiredSpy(&manager, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); +#ifdef Q_OS_SYMBIAN + QTestEventLoop::instance().enterLoop(6); +#else QTestEventLoop::instance().enterLoop(3); +#endif disconnect(&manager, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), this, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); @@ -3317,7 +3298,12 @@ void tst_QNetworkReply::uploadPerformance() void tst_QNetworkReply::httpUploadPerformance() { +#ifdef Q_OS_SYMBIAN + // SHow some mercy for non-desktop platform/s + enum {UploadSize = 4*1024*1024}; // 4 MB +#else enum {UploadSize = 128*1024*1024}; // 128 MB +#endif ThreadedDataReaderHttpServer reader; FixedSizeDataGenerator generator(UploadSize); @@ -3382,8 +3368,12 @@ void tst_QNetworkReply::httpDownloadPerformance() { QFETCH(bool, serverSendsContentLength); QFETCH(bool, chunkedEncoding); - +#ifdef Q_OS_SYMBIAN + // Show some mercy to non-desktop platform/s + enum {UploadSize = 4*1024*1024}; // 4 MB +#else enum {UploadSize = 128*1024*1024}; // 128 MB +#endif HttpDownloadPerformanceServer server(UploadSize, serverSendsContentLength, chunkedEncoding); QNetworkRequest request(QUrl("http://127.0.0.1:" + QString::number(server.serverPort()) + "/?bare=1")); @@ -3411,6 +3401,9 @@ void tst_QNetworkReply::downloadProgress_data() #ifndef Q_OS_SYMBIAN QTest::newRow("big") << 4096; #else + // it can run even with 4096 + // but it takes lot time + //especially on emulator QTest::newRow("big") << 1024; #endif } @@ -3441,20 +3434,11 @@ void tst_QNetworkReply::downloadProgress() QFETCH(int, loopCount); for (int i = 1; i <= loopCount; ++i) { -#ifdef Q_OS_SYMBIAN - if(i % 500 == 0) { - qWarning("iteration %d", i); - } -#endif sender->write(data); QVERIFY2(sender->waitForBytesWritten(2000), "Network timeout"); spy.clear(); -#ifdef Q_OS_SYMBIAN - QTestEventLoop::instance().enterLoop(5); -#else QTestEventLoop::instance().enterLoop(2); -#endif QVERIFY(!QTestEventLoop::instance().timeout()); QVERIFY(spy.count() > 0); QVERIFY(!reply->isFinished()); @@ -3469,11 +3453,7 @@ void tst_QNetworkReply::downloadProgress() delete sender; spy.clear(); -#ifdef Q_OS_SYMBIAN - QTestEventLoop::instance().enterLoop(5); -#else QTestEventLoop::instance().enterLoop(2); -#endif QVERIFY(!QTestEventLoop::instance().timeout()); QVERIFY(spy.count() > 0); QVERIFY(!reply->isRunning()); @@ -3762,11 +3742,7 @@ void tst_QNetworkReply::httpProxyCommands() // wait for the finished signal connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); -#ifdef Q_OS_SYMBIAN - QTestEventLoop::instance().enterLoop(5); -#else QTestEventLoop::instance().enterLoop(1); -#endif QVERIFY(!QTestEventLoop::instance().timeout()); @@ -3797,7 +3773,15 @@ void tst_QNetworkReply::proxyChange() QNetworkReplyPtr reply2 = manager.get(req); connect(reply2, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); +#ifdef Q_OS_SYMBIAN + // we need more time as: + // 1. running from the emulator + // 2. not perfect POSIX implementation + // 3. embedded device + QTestEventLoop::instance().enterLoop(20); +#else QTestEventLoop::instance().enterLoop(10); +#endif QVERIFY(!QTestEventLoop::instance().timeout()); if (finishedspy.count() == 0) { -- cgit v0.12 From 3d05195088045f3854ff94c527fc211458d52850 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 21 Aug 2009 13:46:25 +0200 Subject: Fixes: Missing deployment of backends for phonon examples RevBy: Joerg Details: deployment of waveout and direct show backend Conflicts: examples/phonon/capabilities/capabilities.pro examples/phonon/musicplayer/musicplayer.pro (Cherry-pick of d6cfcd22472128cc68c75a7e24791a909082732f) --- examples/phonon/capabilities/capabilities.pro | 6 +++++- examples/phonon/musicplayer/musicplayer.pro | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/phonon/capabilities/capabilities.pro b/examples/phonon/capabilities/capabilities.pro index 7f1ca76..d05e5ec 100644 --- a/examples/phonon/capabilities/capabilities.pro +++ b/examples/phonon/capabilities/capabilities.pro @@ -10,4 +10,8 @@ sources.files = $$SOURCES $$HEADERS capabilities.pro sources.path = $$[QT_INSTALL_EXAMPLES]/phonon/capabilities INSTALLS += target sources -symbian:TARGET.UID3 = 0xA000CF69 \ No newline at end of file +wince*{ +DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout +} + +symbian:TARGET.UID3 = 0xA000CF69 diff --git a/examples/phonon/musicplayer/musicplayer.pro b/examples/phonon/musicplayer/musicplayer.pro index e17d29c..a0c953a 100644 --- a/examples/phonon/musicplayer/musicplayer.pro +++ b/examples/phonon/musicplayer/musicplayer.pro @@ -14,4 +14,4 @@ wince*{ DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout } -symbian:TARGET.UID3 = 0xA000CF6A \ No newline at end of file +symbian:TARGET.UID3 = 0xA000CF6A -- cgit v0.12 From 8bf325de4ea3a8c57e7708314e783e68478ed985 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 21 Aug 2009 13:50:12 +0200 Subject: Removed an example that was listed twice. RevBy: Espen Riskedal --- examples/graphicsview/graphicsview.pro | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro index daf7cc0..95f66b7 100644 --- a/examples/graphicsview/graphicsview.pro +++ b/examples/graphicsview/graphicsview.pro @@ -8,7 +8,6 @@ SUBDIRS = \ !symbian: SUBDIRS += \ diagramscene \ dragdroprobot \ - basicgraphicslayouts \ anchorlayout contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids -- cgit v0.12 From 342e59730c512fd38a0b03888254b52f2a181ae9 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 21 Aug 2009 13:50:53 +0200 Subject: Remove commented-out code from examples. RevBy: Trust me --- examples/network/network-chat/peermanager.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/network/network-chat/peermanager.cpp b/examples/network/network-chat/peermanager.cpp index a038571..8fdef8c 100644 --- a/examples/network/network-chat/peermanager.cpp +++ b/examples/network/network-chat/peermanager.cpp @@ -165,10 +165,6 @@ void PeerManager::updateAddresses() foreach (QNetworkAddressEntry entry, interface.addressEntries()) { QHostAddress broadcastAddress = entry.broadcast(); if (broadcastAddress != QHostAddress::Null && entry.ip() != QHostAddress::LocalHost) { - //printf("entry.ip: %s\n", entry.ip().toString().toLatin1().data()); - //printf("entry.netmask: %s\n", entry.netmask().toString().toLatin1().data()); - //printf("entry.prefixLength: %i\n", entry.prefixLength()); - //printf("entry.broadcast %s \n", broadcastAddress.toString().toLatin1().data()); broadcastAddresses << broadcastAddress; ipAddresses << entry.ip(); } -- cgit v0.12 From 4aa6869877d4906fcfaac5388294748512cace25 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Fri, 21 Aug 2009 13:58:44 +0200 Subject: Remove changes from bad merge. This was related to e93ffdbb6fde611defc34fd27aec25c40da5a60e. Again, this most likely happened when switching between 4.5 and 4.6 and resolving some conflict incorrectly. --- examples/painting/svgviewer/files/bubbles.svg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/painting/svgviewer/files/bubbles.svg b/examples/painting/svgviewer/files/bubbles.svg index b20666e..9fae8cc 100644 --- a/examples/painting/svgviewer/files/bubbles.svg +++ b/examples/painting/svgviewer/files/bubbles.svg @@ -78,6 +78,10 @@ + + + @@ -176,8 +180,6 @@ -<<<<<<< HEAD:examples/painting/svgviewer/files/bubbles.svg -======= @@ -187,7 +189,6 @@ ->>>>>>> qt/master:examples/painting/svgviewer/files/bubbles.svg -- cgit v0.12