diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-04-29 16:24:37 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-04-29 16:24:37 (GMT) |
| commit | 1308909157ec62d1f55135ce40090d7383e0db17 (patch) | |
| tree | cc481f7cdc229a498a210836ec0f4a7cada24646 /src/gui | |
| parent | 78821cd51c69757a7b4e711c495e702adf97d682 (diff) | |
| parent | 43503e38d91c0e8375c2d5993de201419ba854ec (diff) | |
| download | Qt-1308909157ec62d1f55135ce40090d7383e0db17.zip Qt-1308909157ec62d1f55135ce40090d7383e0db17.tar.gz Qt-1308909157ec62d1f55135ce40090d7383e0db17.tar.bz2 | |
Fix merge conflict
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qvolatileimage.cpp | 5 | ||||
| -rw-r--r-- | src/gui/image/qvolatileimage_p.h | 1 |
2 files changed, 6 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(); diff --git a/src/gui/image/qvolatileimage_p.h b/src/gui/image/qvolatileimage_p.h index fc5d6b1..d835f45 100644 --- a/src/gui/image/qvolatileimage_p.h +++ b/src/gui/image/qvolatileimage_p.h @@ -71,6 +71,7 @@ public: ~QVolatileImage(); QVolatileImage &operator=(const QVolatileImage &rhs); + bool paintingActive() const; bool isNull() const; QImage::Format format() const; int width() const; |