diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-10-22 06:45:24 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-10-22 06:45:24 (GMT) |
| commit | 822e8a6d59847035fe91970487dbb2a765042553 (patch) | |
| tree | 4266f47c70353e724201d2c61b1f988dea62707d /src/gui/egl/qegl_p.h | |
| parent | f07a027b342e09fbb9d1678d3855cddfc27d3925 (diff) | |
| parent | 100afe8da00fdb1661b22e049960ed00a1d3c765 (diff) | |
| download | Qt-822e8a6d59847035fe91970487dbb2a765042553.zip Qt-822e8a6d59847035fe91970487dbb2a765042553.tar.gz Qt-822e8a6d59847035fe91970487dbb2a765042553.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/egl/qegl_p.h')
| -rw-r--r-- | src/gui/egl/qegl_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h index dc399da..16b5b16 100644 --- a/src/gui/egl/qegl_p.h +++ b/src/gui/egl/qegl_p.h @@ -110,7 +110,7 @@ public: EGLDisplay display() const { return dpy; } EGLContext context() const { return ctx; } - void setContext(EGLContext context) { ctx = context; } + void setContext(EGLContext context) { ctx = context; ownsContext = false;} EGLConfig config() const { return cfg; } void setConfig(EGLConfig config) { cfg = config; } @@ -131,6 +131,7 @@ private: EGLConfig cfg; EGLSurface currentSurface; bool current; + bool ownsContext; static EGLDisplay getDisplay(QPaintDevice *device); |