projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
87ee382
)
Use the context we're given
author
Gunnar Sletta
<gunnar.sletta@nokia.com>
Fri, 9 Sep 2011 18:15:40 +0000
(20:15 +0200)
committer
Samuel Rødal
<samuel.rodal@nokia.com>
Mon, 12 Sep 2011 07:08:35 +0000
(09:08 +0200)
Change-Id: I5bdcd1baf1bff86d281664c219098fe841b43fce
Reviewed-on: http://codereview.qt-project.org/4629
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
src/gui/opengl/qopenglfunctions.cpp
patch
|
blob
|
history
diff --git
a/src/gui/opengl/qopenglfunctions.cpp
b/src/gui/opengl/qopenglfunctions.cpp
index
8396a0e
..
4024a38
100644
(file)
--- a/
src/gui/opengl/qopenglfunctions.cpp
+++ b/
src/gui/opengl/qopenglfunctions.cpp
@@
-206,7
+206,7
@@
QOpenGLFunctions::QOpenGLFunctions(QOpenGLContext *context)
: d_ptr(0)
{
if (context && QOpenGLContextGroup::currentContextGroup() == context->shareGroup())
- d_ptr = qt_gl_functions();
+ d_ptr = qt_gl_functions(
context
);
else
qWarning() << "QOpenGLFunctions created with non-current context";
}