diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 11:05:17 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 11:05:17 +0200 |
| commit | 26139fcacc05b4a74fce1ef4e0db819118765310 (patch) | |
| tree | 75ce453868e95faa72b8f3b871c58969bbeb2a7e /tests/auto/qglthreads/tst_qglthreads.cpp | |
| parent | 9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3 (diff) | |
| parent | b8238ec7e41d483a9166eb7aebbf911f36976cdc (diff) | |
| download | qt4-tools-26139fcacc05b4a74fce1ef4e0db819118765310.tar.gz | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
Diffstat (limited to 'tests/auto/qglthreads/tst_qglthreads.cpp')
| -rw-r--r-- | tests/auto/qglthreads/tst_qglthreads.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp index 38b0dab8a2..9441406052 100644 --- a/tests/auto/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/qglthreads/tst_qglthreads.cpp @@ -45,6 +45,10 @@ #include <QtOpenGL/QtOpenGL> #include "tst_qglthreads.h" +#ifdef Q_OS_SYMBIAN +#include <unistd.h> // for usleep +#endif + #define RUNNING_TIME 5000 tst_QGLThreads::tst_QGLThreads(QObject *parent) @@ -203,6 +207,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); } } |