diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-27 19:53:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:41:42 +0200 |
| commit | 95cebd34ebc5b4d39b11dc91610309a35e488663 (patch) | |
| tree | 90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/auto/opengl | |
| parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) | |
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/opengl')
| -rw-r--r-- | tests/auto/opengl/qglthreads/tst_qglthreads.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp index ee05e406c8..96624a9485 100644 --- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp @@ -46,14 +46,7 @@ #include <QtOpenGL/QtOpenGL> #include "tst_qglthreads.h" -#ifdef Q_OS_SYMBIAN -#define RUNNING_TIME 2000 // save GPU mem by running shorter time. -#else #define RUNNING_TIME 5000 -#endif - - - tst_QGLThreads::tst_QGLThreads(QObject *parent) : QObject(parent) @@ -205,12 +198,6 @@ public: while (time.elapsed() < RUNNING_TIME) { int width = 400; int height = 300; -#ifdef Q_OS_SYMBIAN - // GPU mem is very scarce resource on Symbian currently. - // That's why we create only small textures. - width = 50; - height = 20; -#endif QImage image(width, height, QImage::Format_RGB32); QPainter p(&image); p.fillRect(image.rect(), QColor(rand() % 256, rand() % 256, rand() % 256)); @@ -441,10 +428,6 @@ void tst_QGLThreads::renderInThread() QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll); #endif -#ifdef Q_OS_SYMBIAN - QSKIP("OpenGL threading tests are disabled on Symbian as accessing RWindow from a secondary thread is not supported", SkipAll); -#endif - QFETCH(bool, resize); QFETCH(bool, update); |