diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-07-15 15:16:42 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-07-15 15:16:42 (GMT) |
| commit | 4e0d2169790f91348c59432f651878e604923dae (patch) | |
| tree | 157936b07bdcda675741f689d570db543dac4302 /src/opengl | |
| parent | 8106f716043c22d71ff3dcdf9cd8a4db258fa81f (diff) | |
| parent | 84f984b24400aed7cc72fdf432a076f98bc142a2 (diff) | |
| download | Qt-4e0d2169790f91348c59432f651878e604923dae.zip Qt-4e0d2169790f91348c59432f651878e604923dae.tar.gz Qt-4e0d2169790f91348c59432f651878e604923dae.tar.bz2 | |
Merge remote branch 'origin/master' into qt-master-from-4.7
Conflicts:
src/opengl/qgl_p.h
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index e00a056..5044795 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -417,7 +417,7 @@ public: #endif #if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) - static QGLExtensionFuncs qt_extensionFuncs; + static Q_OPENGL_EXPORT QGLExtensionFuncs qt_extensionFuncs; static Q_OPENGL_EXPORT QGLExtensionFuncs& extensionFuncs(const QGLContext *); #endif |