diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-02-04 16:12:58 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-11 12:29:05 +0100 |
| commit | c927d6b9e161ee22822dbfb0654f5734c9101aa7 (patch) | |
| tree | 939bd884ed2d404dd2b6ec49d945b4d944576f4a /src/opengl/qglpixelbuffer.cpp | |
| parent | 7f15506548e82e85560a9b6a57bfdb372883c367 (diff) | |
Rename function to fix symbol clash in static build
Rename qt_gl_read_framebuffer function to qt_gl_read_frame_buffer in
Qt5OpenGL. This fixes an error when linking statically against both Qt5Gui
and Qt5OpenGL:
Qt5Guid.lib(qopenglframebufferobject.obj) : error LNK2005: "class QImage
__cdecl qt_gl_read_framebuffer(class QSize const &,bool,bool)"
(?qt_gl_read_framebuffer@@YA?AVQImage@@ABVQSize@@_N1@Z) already defined in
Qt5OpenGLd.lib(qgl.obj)
Creating library debug\composition.lib and object debug\composition.exp
The function was duplicated in 6e28e844 .
Change-Id: I9e3b78e0ec5b25264575d563538587b45cd93e86
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/opengl/qglpixelbuffer.cpp')
| -rw-r--r-- | src/opengl/qglpixelbuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index 36b9e60937..e514e34552 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -108,7 +108,7 @@ QT_BEGIN_NAMESPACE -extern QImage qt_gl_read_framebuffer(const QSize&, bool, bool); +extern QImage qt_gl_read_frame_buffer(const QSize&, bool, bool); QGLContext* QGLPBufferGLPaintDevice::context() const @@ -391,7 +391,7 @@ QImage QGLPixelBuffer::toImage() const const_cast<QGLPixelBuffer *>(this)->makeCurrent(); if (d->fbo) d->fbo->bind(); - return qt_gl_read_framebuffer(d->req_size, d->format.alpha(), true); + return qt_gl_read_frame_buffer(d->req_size, d->format.alpha(), true); } /*! |