diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-04-30 03:26:05 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-04-30 03:26:05 (GMT) |
| commit | 0ee6bf1226f3069f117d0b0b75df14ddf38e75de (patch) | |
| tree | 01a63f8585790624e1746ba1b43cd91731699e42 /src/gui/painting/qpainter.cpp | |
| parent | 0a4b78de06b60a5fc0a9182687ded099968c4055 (diff) | |
| parent | 0282ea19722c247157c652ef9122379f0e715497 (diff) | |
| download | Qt-0ee6bf1226f3069f117d0b0b75df14ddf38e75de.zip Qt-0ee6bf1226f3069f117d0b0b75df14ddf38e75de.tar.gz Qt-0ee6bf1226f3069f117d0b0b75df14ddf38e75de.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index caed293..d9c7937 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -5167,6 +5167,9 @@ void QPainter::drawPixmap(const QPointF &p, const QPixmap &pm) Q_D(QPainter); + if (!d->engine) + return; + #ifndef QT_NO_DEBUG qt_painter_thread_test(d->device->devType(), "drawPixmap()"); #endif @@ -5176,9 +5179,6 @@ void QPainter::drawPixmap(const QPointF &p, const QPixmap &pm) return; } - if (!d->engine) - return; - qreal x = p.x(); qreal y = p.y(); |