diff options
author | radman0x <conrad.mercer@gmail.com> | 2013-05-17 05:47:54 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-24 09:48:08 +0200 |
commit | dff296c8263b5ca31c0f9713d5171798cc7013ba (patch) | |
tree | 45ee1e7d5bbdf849461712dd1eadaa35a6f37678 /src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h | |
parent | a3a43abc048d9ca1a50368c1dbb77cc8cf7a61b1 (diff) |
Fixed static linking against QtGui and QtOpenGL
When linking QtGui and QtOpenGL libraries on linux a multiple defined
symbols linker error causes failure. This change renames the offending
class in the QtOpenGL library. For more information see:
http://qt-project.org/forums/viewthread/27458
Change-Id: I05488bf2c5c612476432c11095b24bc2b29c78f2
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h')
-rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index b0517fd083..76ef3aa55a 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -82,12 +82,12 @@ QT_BEGIN_NAMESPACE class QGL2PaintEngineExPrivate; -class QOpenGL2PaintEngineState : public QPainterState +class QGL2PaintEngineState : public QPainterState { public: - QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &other); - QOpenGL2PaintEngineState(); - ~QOpenGL2PaintEngineState(); + QGL2PaintEngineState(QGL2PaintEngineState &other); + QGL2PaintEngineState(); + ~QGL2PaintEngineState(); uint isNew : 1; uint needsClipBufferClear : 1; @@ -141,11 +141,11 @@ public: virtual void setState(QPainterState *s); virtual QPainterState *createState(QPainterState *orig) const; - inline QOpenGL2PaintEngineState *state() { - return static_cast<QOpenGL2PaintEngineState *>(QPaintEngineEx::state()); + inline QGL2PaintEngineState *state() { + return static_cast<QGL2PaintEngineState *>(QPaintEngineEx::state()); } - inline const QOpenGL2PaintEngineState *state() const { - return static_cast<const QOpenGL2PaintEngineState *>(QPaintEngineEx::state()); + inline const QGL2PaintEngineState *state() const { + return static_cast<const QGL2PaintEngineState *>(QPaintEngineEx::state()); } void beginNativePainting(); |