diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-04 08:25:13 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-04 08:25:13 (GMT) |
| commit | 6c3f538a0657bd7b00f32934234395682623c17a (patch) | |
| tree | 1185d0a014f09dec9c44dc336a6514d716c15eab /src/gui/painting/qpainter.cpp | |
| parent | 0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1 (diff) | |
| parent | 92a3662564f421a46761989d153f6c8eb990131f (diff) | |
| download | Qt-6c3f538a0657bd7b00f32934234395682623c17a.zip Qt-6c3f538a0657bd7b00f32934234395682623c17a.tar.gz Qt-6c3f538a0657bd7b00f32934234395682623c17a.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index ed400df..a6bea76 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -162,6 +162,9 @@ static bool qt_painter_thread_test(int devType, const char *what, bool extraCond void QPainterPrivate::checkEmulation() { Q_ASSERT(extended); + if (extended->flags() & QPaintEngineEx::DoNotEmulate) + return; + bool doEmulation = false; if (state->bgMode == Qt::OpaqueMode) doEmulation = true; @@ -1835,11 +1838,6 @@ bool QPainter::end() return true; } - if (d->states.size() > 1) { - qWarning("QPainter::end: Painter ended with %d saved states", - d->states.size()); - } - bool ended = true; if (d->engine->isActive()) { @@ -1853,6 +1851,11 @@ bool QPainter::end() } } + if (d->states.size() > 1) { + qWarning("QPainter::end: Painter ended with %d saved states", + d->states.size()); + } + if (d->engine->autoDestruct()) { delete d->engine; } |