path: root/src/opengl/qgl.cpp
diff options
authorKai Koehne <>2013-02-04 16:12:58 +0100
committerThe Qt Project <>2013-02-11 12:29:05 +0100
commitc927d6b9e161ee22822dbfb0654f5734c9101aa7 (patch)
tree939bd884ed2d404dd2b6ec49d945b4d944576f4a /src/opengl/qgl.cpp
parent7f15506548e82e85560a9b6a57bfdb372883c367 (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 <> Reviewed-by: Samuel Rødal <>
Diffstat (limited to 'src/opengl/qgl.cpp')
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 3cb738b9c8..6476e2b26c 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1637,7 +1637,7 @@ static void convertFromGLImage(QImage &img, int w, int h, bool alpha_format, boo
img = img.mirrored();
-QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha)
+QImage qt_gl_read_frame_buffer(const QSize &size, bool alpha_format, bool include_alpha)
QImage img(size, (alpha_format && include_alpha) ? QImage::Format_ARGB32_Premultiplied
: QImage::Format_RGB32);
@@ -4063,7 +4063,7 @@ QImage QGLWidget::grabFrameBuffer(bool withAlpha)
int w = width();
int h = height();
if (format().rgba())
- res = qt_gl_read_framebuffer(QSize(w, h), format().alpha(), withAlpha);
+ res = qt_gl_read_frame_buffer(QSize(w, h), format().alpha(), withAlpha);
return res;