diff options
| author | David Faure <faure@kde.org> | 2009-05-29 12:41:19 (GMT) |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2009-05-29 12:41:19 (GMT) |
| commit | 5d0870bd71f33c9267572655d0f842c82b017d6a (patch) | |
| tree | f983ac36c0c46aa226a8b51b4e6db13b4f76ff40 /src/opengl/qgl.h | |
| parent | 1d8a4f55ce40400fcb35a645f2e94837e6ab0a24 (diff) | |
| parent | 9088aeae9daf02546769377853824397458ba822 (diff) | |
| download | Qt-5d0870bd71f33c9267572655d0f842c82b017d6a.zip Qt-5d0870bd71f33c9267572655d0f842c82b017d6a.tar.gz Qt-5d0870bd71f33c9267572655d0f842c82b017d6a.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/qt/qt
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 32fbce2..19d779a 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -372,8 +372,8 @@ private: friend QGLContextPrivate *qt_phonon_get_dptr(const QGLContext *); #endif friend class QGLFramebufferObject; -#ifdef Q_WS_WIN friend class QGLFramebufferObjectPrivate; +#ifdef Q_WS_WIN friend bool qt_resolve_GLSL_functions(QGLContext *ctx); friend bool qt_createGLSLProgram(QGLContext *ctx, GLuint &program, const char *shader_src, GLuint &shader); #endif |