diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2012-11-26 12:57:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-30 18:28:04 +0100 |
| commit | 6385a182f0f93820c96cf274e50a56492491ee10 (patch) | |
| tree | 5772f4c8570e620448e3ab7473c9e2df5af4005a /tests/auto/opengl/qglthreads/qglthreads.pro | |
| parent | 3ee48926e6584b4afeda1fc406d19d7b1a8d6f20 (diff) | |
Added explicit threading API to QtOpenGL.
Since QtOpenGL/QGLContext is implemented in terms of
QtGui/QOpenGLContext which has stricter requirements about how it's
supposed to be used, we need to apply these requirements to QGLContext
as well.
This change adds QGLContext::moveToThread(QThread *) and documents it as
a necessity for making a context current on another thread.
Also introduces QGLPixelbuffer::context() to access the QGLContext of a
pixelbuffer, and made QGLWidget::context() return a non-const
QGLContext, since there's no good reason why it shouldn't, and it leads
to less const_cast clutter.
We could have introduced a backdoor in QOpenGLContext instead, making it
loosen its requirements, but that would have made it harder / impossible
to fully support threaded OpenGL in all the platforms.
Task-number: QTBUG-22560
Change-Id: Ibb6f65f342e7c963e80cc42ab5664c5f1cab30b0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'tests/auto/opengl/qglthreads/qglthreads.pro')
| -rw-r--r-- | tests/auto/opengl/qglthreads/qglthreads.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/opengl/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro index 754f494cfa..d5cbd0d9ed 100644 --- a/tests/auto/opengl/qglthreads/qglthreads.pro +++ b/tests/auto/opengl/qglthreads/qglthreads.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qglthreads requires(contains(QT_CONFIG,opengl)) -QT += opengl widgets testlib +QT += opengl widgets testlib gui-private core-private HEADERS += tst_qglthreads.h SOURCES += tst_qglthreads.cpp @@ -10,5 +10,6 @@ x11 { LIBS += $$QMAKE_LIBS_X11 } -CONFIG+=insignificant_test # QTBUG-22560 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +win32:CONFIG+=insignificant_test # QTBUG-28264 |