Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits)
  Use QTRY_COMPARE to give the animation a chance to finish
  Cocoa: Sheets loose their opacity on 2nd show
  Added function overload for QByteArray &QByteArray::replace()
  Second attempt at work-around for MSVC2008 compiler crash
  QNativeSocketEngine: Fix some error handling related to waitFor*()
  qdoc:	List new QML elements in \sincelist for What's New page.
  Cocoa: fix namespace build
  Cocoa: Fix build with namespace
  Cocoa: namespace build fix
  doc:	Fixed some qdoc errors.
  Don't include private headers from public headers.
  Fix compilation on HP-UXi: m_volume is a #define
  WinCE doesn't have sys/types.h
  Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds
  Fix compilation on recent Linux systems: getpid(2) is in unistd.h.
  Cocoa: calling QEventLoop::exec from mouse up causes problem
  Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined)
  Doc: Collected the Declarative UI tutorials together and renamed them.
  Doc: Simplified Commercial Editions for Qt 4.7.
  Work around MSVC2008 compiler crash
  ...

1 files changed, 6 insertions, 0 deletions

diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index a890b3b..a169ca0 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -185,6 +185,9 @@ void QNativeSocketEnginePrivate::setError(QAbstractSocket::SocketError error, Er
         // socket to recreate its engine after an error. Note: There's
         // one exception: SocketError(11) bypasses this as it's purely
         // a temporary internal error condition.
+        // Another exception is the way the waitFor*() functions set
+        // an error when a timeout occurs. After the call to setError()
+        // they reset the hasSetSocketError to false
         return;
     }
     if (error != QAbstractSocket::SocketError(11))
@@ -859,6 +862,7 @@ bool QNativeSocketEngine::waitForRead(int msecs, bool *timedOut)
             *timedOut = true;
         d->setError(QAbstractSocket::SocketTimeoutError,
             QNativeSocketEnginePrivate::TimeOutErrorString);
+        d->hasSetSocketError = false; // A timeout error is temporary in waitFor functions
         return false;
     } else if (state() == QAbstractSocket::ConnectingState) {
         connectToHost(d->peerAddress, d->peerPort);
@@ -927,6 +931,7 @@ bool QNativeSocketEngine::waitForWrite(int msecs, bool *timedOut)
             *timedOut = true;
         d->setError(QAbstractSocket::SocketTimeoutError,
                     QNativeSocketEnginePrivate::TimeOutErrorString);
+        d->hasSetSocketError = false; // A timeout error is temporary in waitFor functions
         return false;
     } else if (state() == QAbstractSocket::ConnectingState) {
         connectToHost(d->peerAddress, d->peerPort);
@@ -978,6 +983,7 @@ bool QNativeSocketEngine::waitForReadOrWrite(bool *readyToRead, bool *readyToWri
             *timedOut = true;
         d->setError(QAbstractSocket::SocketTimeoutError,
                     QNativeSocketEnginePrivate::TimeOutErrorString);
+        d->hasSetSocketError = false; // A timeout error is temporary in waitFor functions
         return false;
     } else if (state() == QAbstractSocket::ConnectingState) {
         connectToHost(d->peerAddress, d->peerPort);