diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
| commit | 34679dd23213881a9632e21e4858377ff90a9006 (patch) | |
| tree | deb9ebf681d4954b2d44858ca1a14d251c31e8eb /src/openvg/qpaintengine_vg.cpp | |
| parent | 7669f91c33328505fbe52f4913bd3f8745b76d31 (diff) | |
| parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
src/corelib/io/qfilesystemwatcher_symbian_p.h
Diffstat (limited to 'src/openvg/qpaintengine_vg.cpp')
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 2e6caf20f..b0e190fe1 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -1323,7 +1323,7 @@ QPainterState *QVGPaintEngine::createState(QPainterState *orig) const return new QVGPainterState(); } else { Q_D(const QVGPaintEngine); - QVGPaintEnginePrivate *d2 = const_cast<QVGPaintEnginePrivate*>(d.data()); + QVGPaintEnginePrivate *d2 = const_cast<QVGPaintEnginePrivate*>(d); QVGPainterState *origState = static_cast<QVGPainterState *>(orig); origState->savedDirty = d2->dirty; d2->dirty = 0; |