diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-04-28 07:59:43 (GMT) |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-04-28 07:59:43 (GMT) |
| commit | 0d70b0a9faecf042fdb20e0056bdaaec289b851c (patch) | |
| tree | 5ad6397fbab4dac6b37f740256aa585183e147c1 /src/declarative/graphicsitems/qdeclarativeborderimage.cpp | |
| parent | d45ec470519d1075ebf299b74cbb846a0c7d99af (diff) | |
| parent | ce4996b624678f37b13fbb7db810cccd8970a889 (diff) | |
| download | Qt-0d70b0a9faecf042fdb20e0056bdaaec289b851c.zip Qt-0d70b0a9faecf042fdb20e0056bdaaec289b851c.tar.gz Qt-0d70b0a9faecf042fdb20e0056bdaaec289b851c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeborderimage.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeborderimage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index 8f37e90..45a03a0 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -300,7 +300,7 @@ void QDeclarativeBorderImage::load() } if (d->url.isEmpty()) { - d->pix.clear(); + d->pix.clear(this); d->status = Null; setImplicitWidth(0); setImplicitHeight(0); @@ -340,6 +340,7 @@ void QDeclarativeBorderImage::load() options |= QDeclarativePixmap::Asynchronous; if (d->cache) options |= QDeclarativePixmap::Cache; + d->pix.clear(this); d->pix.load(qmlEngine(this), d->url, options); if (d->pix.isLoading()) { @@ -472,6 +473,7 @@ void QDeclarativeBorderImage::setGridScaledImage(const QDeclarativeGridScaledIma options |= QDeclarativePixmap::Asynchronous; if (d->cache) options |= QDeclarativePixmap::Cache; + d->pix.clear(this); d->pix.load(qmlEngine(this), d->sciurl, options); if (d->pix.isLoading()) { |