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

7 files changed, 42 insertions, 58 deletions

diff --git a/configure.exe b/configure.exe
index 659f744..4c095d2 100755
--- a/configure.exe
+++ b/configure.exe
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
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();
             }
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 @@
       <!-- Define a shadow for each sphere. -->
       <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
       <g id="bubble">
+        <circle fill="black" cx="0" cy="0" r="50" />
+        <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+        <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+                              L -11,22 L -1,12 Z" />
         <circle cx="0" cy="0" r="100" />
       </g>
     </defs>
@@ -176,8 +180,6 @@
     </g>
   </g>
     <g transform="translate(200,0)" >
-<<<<<<< HEAD:examples/painting/svgviewer/files/bubbles.svg
-=======
     <g transform="translate(200,490) scale(2.0,1.0) rotate(45)" >
       <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
       <circle fill="black" cx="0" cy="0" r="50" />
@@ -187,7 +189,6 @@
       <animateTransform attributeName="transform"  type="rotate" additive="sum" values="0; 360"
 	         begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" />
     </g>
->>>>>>> qt/master:examples/painting/svgviewer/files/bubbles.svg
     <g transform="translate(200,375)">
       <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
       <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
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
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<QSslError>)),
             SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
 #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) {