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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix gcc compilation problems in QtOpenGL. Actually was typo and
  Revert "When using complex transformations rendering goes easily off by one pixel."
  fix for USER: 163 panic found on 5800XM
  Fixed library ordering when linking to qtmain.
  Made javascriptcore depend on corelib.
  Enable QtOpenGL vector path caching on Symbian/IVE3
  Made scripttools disabled on Symbian by default, like on Windows.
  Got rid of "No such directory" warning when shadow building.
  Added qmake check for presence of RHttpDownloadMgr header
  Fixed crash on startup in Symbian debug build
  fixed hybrid heap Symbian udeb build issues
  qmediaplayer: show buffer status of 0%
  Progressive download in Phonon MMF backend: integrated with player
  Progressive download in Phonon MMF backend: added download managers
  Remove partial upgrade deployment generation for Webkit

1 files changed, 5 insertions, 0 deletions

diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp
index cce3161..06131bd 100644
--- a/tests/auto/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/qglthreads/tst_qglthreads.cpp
@@ -49,6 +49,10 @@
 #include <private/qt_x11_p.h>
 #endif
 
+#ifdef Q_OS_SYMBIAN
+#include <unistd.h> // for usleep
+#endif
+
 #define RUNNING_TIME 5000
 
 tst_QGLThreads::tst_QGLThreads(QObject *parent)
@@ -209,6 +213,7 @@ public:
             p.drawText(image.rect(), Qt::AlignCenter, "This is an autotest");
             p.end();
             m_gl->bindTexture(image, GL_TEXTURE_2D, GL_RGBA, QGLContext::InternalBindOption);
+
             createdAndUploaded(image);
         }
     }