Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fixed unit test failure in qimagereader.
  beautify tst_QLocalSocket::writeToClientAndDisconnect
  QLocalSocket/Win: check for broken pipe in waitForReadyRead
  QLocalSocket/Win: call close on async connection loss
  fix detection of header files
  Prospective S60 build fix
  Thread safety for QFontEngineS60
  Allow to build Qt in static with mingw
  Fix incorrect line breaking in QtWebKit.
  QLocalSocket: don't emit readChannelFinished() twice on Windows
  QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamed
  QLocalSocket: fix reading from a socket after broken connection
  QLocalServer: make many simultaneous connection attempts work on Windows
  tst_QLocalSocket::threadedConnection autotest stabilized
  tst_qlocalsocket: pro files of client / server examples fixed
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d8a9d09376a47b92ea49f1a078c392cbfdbc0ed6 )
  Regression Qt4.4: QMovie does not render properly some mng files
  QMovie cpu usage up to 100%

2 files changed, 2 insertions, 3 deletions

diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp
index 8abc2d1..2da822d 100644
--- a/src/plugins/imageformats/gif/qgifhandler.cpp
+++ b/src/plugins/imageformats/gif/qgifhandler.cpp
@@ -1026,7 +1026,7 @@ inline QRgb QGIFFormat::color(uchar index) const
 QGifHandler::QGifHandler()
 {
     gifFormat = new QGIFFormat;
-    nextDelay = 0;
+    nextDelay = 100;
     loopCnt = 1;
     frameNumber = -1;
     scanIsCached = false;
@@ -1061,7 +1061,7 @@ bool QGifHandler::imageIsComing() const
 
 bool QGifHandler::canRead() const
 {
-    if (!nextDelay && canRead(device())) {
+    if (canRead(device())) {
         setFormat("gif");
         return true;
     }
diff --git a/src/plugins/imageformats/mng/qmnghandler.cpp b/src/plugins/imageformats/mng/qmnghandler.cpp
index d408e6c..9dbb885 100644
--- a/src/plugins/imageformats/mng/qmnghandler.cpp
+++ b/src/plugins/imageformats/mng/qmnghandler.cpp
@@ -271,7 +271,6 @@ bool QMngHandlerPrivate::getNextImage(QImage *result)
     }
     if ((MNG_NOERROR == ret) || (MNG_NEEDTIMERWAIT == ret)) {
         *result = image;
-        image.fill(0);
         frameIndex = nextIndex++;
         if (haveReadAll && (frameCount == 0))
             frameCount = nextIndex;