Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6

4 files changed, 17 insertions, 6 deletions

diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index d6e70be..8a745ab 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -375,7 +375,8 @@ void QLocalSocket::close()
     QIODevice::close();
     d->state = ClosingState;
     emit stateChanged(d->state);
-    emit readChannelFinished();
+    if (!d->pipeClosed)
+        emit readChannelFinished();
     d->serverName = QString();
     d->fullServerName = QString();
 
diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index db0c5ba..82c8dc0 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -293,7 +293,7 @@ void tst_Bic::sizesAndVTables()
 
     bool isFailed = false;
 
-    qDebug() << oldLib.arg(libName);
+    //qDebug() << oldLib.arg(libName);
     if (oldLib.isEmpty() || !QFile::exists(oldLib.arg(libName)))
         QSKIP("No platform spec found for this platform/version.", SkipSingle);
 
diff --git a/tests/auto/q3progressbar/tst_q3progressbar.cpp b/tests/auto/q3progressbar/tst_q3progressbar.cpp
index c5485a7..34a95d3 100644
--- a/tests/auto/q3progressbar/tst_q3progressbar.cpp
+++ b/tests/auto/q3progressbar/tst_q3progressbar.cpp
@@ -93,11 +93,15 @@ class MyCustomProgressBar : public Q3ProgressBar
         void paintEvent(QPaintEvent * event)
         {
             paintNumber++;
+            qDebug() << "PAINT EVENT:" << paintNumber;
             Q3ProgressBar::paintEvent(event);
         }
         int paintNumber;
 };
 
+/*
+  Maybe this test should be redesigned.
+ */
 void tst_Q3ProgressBar::setProgress()
 {
     MyCustomProgressBar * m_progressBar = new MyCustomProgressBar();
@@ -111,15 +115,21 @@ void tst_Q3ProgressBar::setProgress()
     m_progressBar->setProgress(m_progressBar->progress() + 1);
     QCOMPARE(oldValue + 1,m_progressBar->progress());
     QApplication::processEvents();
-    QVERIFY(m_progressBar->paintNumber >= 1); //it might be more than 1 because it is animated
 
+    // It might be > 1 because it is animated.
+    QVERIFY(m_progressBar->paintNumber >= 1);
+    qDebug() << "Animation test: paintNumber =" << m_progressBar->paintNumber;
+    
     //standard case
     m_progressBar->setTotalSteps(3);
     m_progressBar->setProgress(0);
     m_progressBar->paintNumber = 0;
     m_progressBar->setProgress(m_progressBar->progress() + 1);
     QApplication::processEvents();
-    QCOMPARE(m_progressBar->paintNumber,1);
+
+    // It might be > 1 because other events might cause painting.
+    QVERIFY(m_progressBar->paintNumber >= 1);
+    qDebug() << "Standard test: paintNumber =" << m_progressBar->paintNumber;
 }
 
 QTEST_MAIN(tst_Q3ProgressBar)
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
index c0d870f..1180d4d 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
@@ -895,9 +895,9 @@ void tst_QLocalSocket::writeToClientAndDisconnect()
     QCOMPARE(clientSocket->write(buffer, sizeof(buffer)), (qint64)sizeof(buffer));
     clientSocket->waitForBytesWritten();
     clientSocket->disconnectFromServer();
-    qApp->processEvents();  // give the socket the chance to receive data
+    QVERIFY(client.waitForReadyRead());
     QCOMPARE(client.read(buffer, sizeof(buffer)), (qint64)sizeof(buffer));
-    qApp->processEvents();  // give the socket the chance to close itself
+    QVERIFY(client.waitForDisconnected());
     QCOMPARE(client.state(), QLocalSocket::UnconnectedState);
 }