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 | |
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')
-rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 24 | ||||
-rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h | 16 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 27073e80be..4e198cf550 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -1217,7 +1217,7 @@ void QGL2PaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) if (qpen_style(pen) == Qt::NoPen || qbrush_style(penBrush) == Qt::NoBrush) return; - QOpenGL2PaintEngineState *s = state(); + QGL2PaintEngineState *s = state(); if (qt_pen_is_cosmetic(pen, s->renderHints) && !qt_scaleForTransform(s->transform(), 0)) { // QTriangulatingStroker class is not meant to support cosmetically sheared strokes. QPaintEngineEx::stroke(path, pen); @@ -1231,7 +1231,7 @@ void QGL2PaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) void QGL2PaintEngineExPrivate::stroke(const QVectorPath &path, const QPen &pen) { - const QOpenGL2PaintEngineState *s = q->state(); + const QGL2PaintEngineState *s = q->state(); if (snapToPixelGrid) { snapToPixelGrid = false; matrixDirty = true; @@ -1504,7 +1504,7 @@ void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem Q_D(QGL2PaintEngineEx); ensureActive(); - QOpenGL2PaintEngineState *s = state(); + QGL2PaintEngineState *s = state(); const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem); @@ -1579,7 +1579,7 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp { Q_Q(QGL2PaintEngineEx); - QOpenGL2PaintEngineState *s = q->state(); + QGL2PaintEngineState *s = q->state(); void *cacheKey = const_cast<QGLContext *>(QGLContextPrivate::contextGroup(ctx)->context()); bool recreateVertexArrays = false; @@ -2360,8 +2360,8 @@ void QGL2PaintEngineEx::setState(QPainterState *new_state) Q_D(QGL2PaintEngineEx); - QOpenGL2PaintEngineState *s = static_cast<QOpenGL2PaintEngineState *>(new_state); - QOpenGL2PaintEngineState *old_state = state(); + QGL2PaintEngineState *s = static_cast<QGL2PaintEngineState *>(new_state); + QGL2PaintEngineState *old_state = state(); QPaintEngineEx::setState(s); @@ -2402,11 +2402,11 @@ QPainterState *QGL2PaintEngineEx::createState(QPainterState *orig) const if (orig) const_cast<QGL2PaintEngineEx *>(this)->ensureActive(); - QOpenGL2PaintEngineState *s; + QGL2PaintEngineState *s; if (!orig) - s = new QOpenGL2PaintEngineState(); + s = new QGL2PaintEngineState(); else - s = new QOpenGL2PaintEngineState(*static_cast<QOpenGL2PaintEngineState *>(orig)); + s = new QGL2PaintEngineState(*static_cast<QGL2PaintEngineState *>(orig)); s->matrixChanged = false; s->compositionModeChanged = false; @@ -2417,7 +2417,7 @@ QPainterState *QGL2PaintEngineEx::createState(QPainterState *orig) const return s; } -QOpenGL2PaintEngineState::QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &other) +QGL2PaintEngineState::QGL2PaintEngineState(QGL2PaintEngineState &other) : QPainterState(other) { isNew = true; @@ -2428,7 +2428,7 @@ QOpenGL2PaintEngineState::QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &oth rectangleClip = other.rectangleClip; } -QOpenGL2PaintEngineState::QOpenGL2PaintEngineState() +QGL2PaintEngineState::QGL2PaintEngineState() { isNew = true; needsClipBufferClear = true; @@ -2436,7 +2436,7 @@ QOpenGL2PaintEngineState::QOpenGL2PaintEngineState() canRestoreClip = true; } -QOpenGL2PaintEngineState::~QOpenGL2PaintEngineState() +QGL2PaintEngineState::~QGL2PaintEngineState() { } 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(); |