diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 11:26:10 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 11:26:10 (GMT) |
| commit | eb9d1bb05ca32af2658ad38ea731c9ddf17a4954 (patch) | |
| tree | be6a8b2b76f55d80df77ade91f1f43d32971fe64 /src/opengl/qgl_p.h | |
| parent | db76fd9b3cc0acb49c7c017c85ac3326953167f5 (diff) | |
| parent | d9dd68c4400c3ca590ea425d6f3d070ea6094099 (diff) | |
| download | Qt-eb9d1bb05ca32af2658ad38ea731c9ddf17a4954.zip Qt-eb9d1bb05ca32af2658ad38ea731c9ddf17a4954.tar.gz Qt-eb9d1bb05ca32af2658ad38ea731c9ddf17a4954.tar.bz2 | |
Merge branch 'qt-4.7' into lighthouse-4.7
Conflicts:
src/opengl/opengl.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 0e52f22..be76af5 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -171,6 +171,9 @@ public: #if defined(Q_WS_X11) && !defined(QT_NO_EGL) , eglSurfaceWindowId(0) #endif +#if defined(Q_OS_SYMBIAN) + , eglSurfaceWindowId(0) +#endif { isGLWidget = 1; } @@ -212,6 +215,10 @@ public: #elif defined(Q_WS_QWS) QWSGLWindowSurface *wsurf; #endif +#ifdef Q_OS_SYMBIAN + void recreateEglSurface(); + WId eglSurfaceWindowId; +#endif }; class QGLContextResource; @@ -428,7 +435,7 @@ public: static inline QGLExtensionFuncs& extensionFuncs(const QGLContext *ctx) { return ctx->d_ptr->group->extensionFuncs(); } #endif -#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_WS_QPA) +#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_WS_QPA) || defined(Q_OS_SYMBIAN) static QGLExtensionFuncs qt_extensionFuncs; static Q_OPENGL_EXPORT QGLExtensionFuncs& extensionFuncs(const QGLContext *); #endif |