diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-24 08:52:53 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-24 08:52:53 (GMT) |
| commit | ea2480fc41a844e0c331445d986cbbdbceb7cafc (patch) | |
| tree | a33ec966873a2c52ab0b58cc7da1254f130c8ff4 | |
| parent | d32922a417f20fed56f6f4837d8bfdf2899e3d3c (diff) | |
| parent | d7a054e9a887c3e73536a0ea1667492dca46adb0 (diff) | |
| download | Qt-ea2480fc41a844e0c331445d986cbbdbceb7cafc.zip Qt-ea2480fc41a844e0c331445d986cbbdbceb7cafc.tar.gz Qt-ea2480fc41a844e0c331445d986cbbdbceb7cafc.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
| -rw-r--r-- | configure.exe | bin | 1892397 -> 1896493 bytes | |||
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex 5c5c199..322819e 100644 --- a/configure.exe +++ b/configure.exe diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 34305c2..0460071 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -184,7 +184,7 @@ void QPainterPrivate::checkEmulation() extended = emulationEngine; extended->setState(state); } - } else if (emulationEngine && emulationEngine != extended) { + } else if (emulationEngine == extended) { extended = emulationEngine->real_engine; } } |