summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qvolatileimage.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-05-04 10:41:39 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-05-04 10:41:39 (GMT)
commit8a706b5133b1ba1d5eb5fdca97e002597d6ff829 (patch)
tree5cf57028938262d25ea1894784dd97289184241c /src/gui/image/qvolatileimage.cpp
parent9625c564877414695a9706acf34bc8719018ef06 (diff)
parent60e65cc23bf1df213320604062ef98e40c46d3df (diff)
downloadQt-8a706b5133b1ba1d5eb5fdca97e002597d6ff829.zip
Qt-8a706b5133b1ba1d5eb5fdca97e002597d6ff829.tar.gz
Qt-8a706b5133b1ba1d5eb5fdca97e002597d6ff829.tar.bz2
Merge remote-tracking branch 'origin/4.8' into lighthouse-master
Diffstat (limited to 'src/gui/image/qvolatileimage.cpp')
-rw-r--r--src/gui/image/qvolatileimage.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/image/qvolatileimage.cpp b/src/gui/image/qvolatileimage.cpp
index 098e9a1..f5076e1 100644
--- a/src/gui/image/qvolatileimage.cpp
+++ b/src/gui/image/qvolatileimage.cpp
@@ -103,6 +103,11 @@ QVolatileImage &QVolatileImage::operator=(const QVolatileImage &rhs)
return *this;
}
+bool QVolatileImage::paintingActive() const
+{
+ return d->pengine && d->pengine->isActive();
+}
+
bool QVolatileImage::isNull() const
{
return d->image.isNull();