diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-04 18:29:50 +0000 |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-04 18:29:50 +0000 |
| commit | e3500ec7fb8c17c33345142a22eeef8e467564cd (patch) | |
| tree | e081c32e65944a3423899fa94d9580c40e608586 /src | |
| parent | 77c281714d9dea1f3bbc47380d5884bff31402c7 (diff) | |
Fix for link error when building QtSvg
Building QtSvg for Symbian (ARMV5 build) fails due to the following linker
error:
QGraphicsEffectSourcePrivate::invalidateCache(bool) const
(referred from qsvgwidget.o). This function is called from the
inline destructor of QGraphicsEffectSourcePrivate. Making this
destructor non-inline fixes the problem.
It is not clear why QtSvg is instantiating this destructor, however, as
neither QGraphicsEffectSourcePrivate nor any of its derived classes are
referred to from QtSvg source.
This problem seems to have been triggered by 85e41590.
Reviewed-by: Shane Kearns
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/effects/qgraphicseffect.cpp | 5 | ||||
| -rw-r--r-- | src/gui/effects/qgraphicseffect_p.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp index 83f4f792ee..b170254b74 100644 --- a/src/gui/effects/qgraphicseffect.cpp +++ b/src/gui/effects/qgraphicseffect.cpp @@ -303,6 +303,11 @@ QPixmap QGraphicsEffectSource::pixmap(Qt::CoordinateSystem system, QPoint *offse return pm; } +QGraphicsEffectSourcePrivate::~QGraphicsEffectSourcePrivate() +{ + invalidateCache(); +} + void QGraphicsEffectSourcePrivate::invalidateCache(bool effectRectChanged) const { if (effectRectChanged && m_cachedMode != QGraphicsEffectSource::ExpandToEffectRectPadMode) diff --git a/src/gui/effects/qgraphicseffect_p.h b/src/gui/effects/qgraphicseffect_p.h index 0ff5794802..370efdd529 100644 --- a/src/gui/effects/qgraphicseffect_p.h +++ b/src/gui/effects/qgraphicseffect_p.h @@ -72,7 +72,7 @@ public: , m_cachedMode(QGraphicsEffectSource::ExpandToTransparentBorderPadMode) {} - virtual ~QGraphicsEffectSourcePrivate() { invalidateCache(); } + virtual ~QGraphicsEffectSourcePrivate(); virtual void detach() = 0; virtual QRectF boundingRect(Qt::CoordinateSystem system) const = 0; virtual QRect deviceRect() const = 0; |