diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-03 15:41:57 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-03 15:41:57 (GMT) |
| commit | 7b7630eaca0fe1c3e0484232aa42b7cf9e86e3a3 (patch) | |
| tree | 46cfa16fe13528ae668148d8af98fb6e156f0eb6 /src/opengl | |
| parent | 4ec935b3e738f79d76b708773c49471cffc46f65 (diff) | |
| parent | 5414957f0feebe24a2aa0ac7c5ec32e53e49b57a (diff) | |
| download | Qt-7b7630eaca0fe1c3e0484232aa42b7cf9e86e3a3.zip Qt-7b7630eaca0fe1c3e0484232aa42b7cf9e86e3a3.tar.gz Qt-7b7630eaca0fe1c3e0484232aa42b7cf9e86e3a3.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into lighthouse-master
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qpixmapdata_gl.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index 04de1bd..db9f8c8 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE -extern const QGLContext* qt_gl_share_context(); +Q_OPENGL_EXPORT extern const QGLContext* qt_gl_share_context(); /*! \class QGLFramebufferObjectPool diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index cdd3eb9..21b2f09 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -825,11 +825,7 @@ void QGLWindowSurface::updateGeometry() { ctx->updatePaintDevice(); #endif -#ifdef Q_WS_QPA - QSize surfSize = size(); -#else QSize surfSize = geometry().size(); -#endif if (surfSize.width() <= 0 || surfSize.height() <= 0) return; |