diff options
| author | David Faure <faure@kde.org> | 2009-06-04 23:55:22 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-06-04 23:55:22 (GMT) |
| commit | ef0d1c839aed75201da10f8db7e515d9fb55bb16 (patch) | |
| tree | 5f00de5b8913379f9bb28df91782840c7efe6a2d /src/opengl/qgl.cpp | |
| parent | 58c5df4109acf44982c3a2a7b2318da52606232d (diff) | |
| download | Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.zip Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.gz Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.bz2 | |
All of Qt's own code compiles with -pedantic now (but pcre and webkit don't seem fixable easily)
Merge-request: 594
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 60039eb..2e72851 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1456,7 +1456,7 @@ struct DDSFormat { #define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 #endif -Q_GLOBAL_STATIC(QGLShareRegister, _qgl_share_reg); +Q_GLOBAL_STATIC(QGLShareRegister, _qgl_share_reg) Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg() { return _qgl_share_reg(); @@ -2609,7 +2609,7 @@ const QGLContext* QGLContext::currentContext() */ /*! \fn int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc) - + \bold{Win32 only:} This virtual function chooses a pixel format that matches the OpenGL \link setFormat() format\endlink. Reimplement this function in a subclass if you need a custom @@ -2623,7 +2623,7 @@ const QGLContext* QGLContext::currentContext() */ /*! \fn void *QGLContext::chooseVisual() - + \bold{X11 only:} This virtual function tries to find a visual that matches the format, reducing the demands if the original request cannot be met. @@ -4354,7 +4354,7 @@ void QGLWidgetPrivate::initContext(QGLContext *context, const QGLWidget* shareWi } #if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) -Q_GLOBAL_STATIC(QString, qt_gl_lib_name); +Q_GLOBAL_STATIC(QString, qt_gl_lib_name) Q_OPENGL_EXPORT void qt_set_gl_library_name(const QString& name) { |