diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-08 20:31:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-08 20:31:31 +0200 |
| commit | 9cfdd66b6452704349b5f986f31b7f1f03748cb5 (patch) | |
| tree | f23fcc32c0da325402ab9be3da144525d4823f9b /tests/auto/opengl/qglthreads/tst_qglthreads.cpp | |
| parent | 167782691678d6b1588d875036097fadaaced829 (diff) | |
| parent | 1326cd15f7ba985551f0fddc717e3bfc01ddda85 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/opengl/qglthreads/tst_qglthreads.cpp')
| -rw-r--r-- | tests/auto/opengl/qglthreads/tst_qglthreads.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp index e190af31e4..25057ba2a0 100644 --- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp @@ -345,7 +345,7 @@ void renderAScene(int w, int h) { QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions(); - if (QOpenGLContext::currentContext()->isES()) { + if (QOpenGLContext::currentContext()->isOpenGLES()) { Q_UNUSED(w); Q_UNUSED(h); QGLShaderProgram program; |