diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-19 09:46:19 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-19 09:46:19 (GMT) |
| commit | 20befffe67104368f527bab871fec17c33d58977 (patch) | |
| tree | 88c6e9541ecc4433abcb79197c8ecb720cbdefbd /src/gui/effects | |
| parent | d9e6c98c5cb39c7f6397a8015e1395e040135949 (diff) | |
| parent | 85611635a3589d56c2670445ea5272e864e57a98 (diff) | |
| download | Qt-20befffe67104368f527bab871fec17c33d58977.zip Qt-20befffe67104368f527bab871fec17c33d58977.tar.gz Qt-20befffe67104368f527bab871fec17c33d58977.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
Diffstat (limited to 'src/gui/effects')
| -rw-r--r-- | src/gui/effects/qgraphicseffect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp index ce4ce6a..5e4e49e 100644 --- a/src/gui/effects/qgraphicseffect.cpp +++ b/src/gui/effects/qgraphicseffect.cpp @@ -326,7 +326,7 @@ QPixmap QGraphicsEffectSource::pixmap(Qt::CoordinateSystem system, QPoint *offse } QPixmap pm; - if (d->m_cachedSystem == system && d->m_cachedMode == mode) + if (item && d->m_cachedSystem == system && d->m_cachedMode == mode) QPixmapCache::find(d->m_cacheKey, &pm); if (pm.isNull()) { |