diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-01-12 08:07:22 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-01-12 08:07:22 (GMT) |
| commit | b73b5e5a99418cef3b218435382724ab71999558 (patch) | |
| tree | 1b41b496472fac0fd47d93daa3593271e7ac7a7e /src/gui/painting/qpainter.cpp | |
| parent | 705ebaea0d81c76c97e7230f0acbe85442981555 (diff) | |
| parent | e8f45c5ba8371053817f13e70d78b06f229d8666 (diff) | |
| download | Qt-b73b5e5a99418cef3b218435382724ab71999558.zip Qt-b73b5e5a99418cef3b218435382724ab71999558.tar.gz Qt-b73b5e5a99418cef3b218435382724ab71999558.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 8ed126f..fd67f96 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1329,7 +1329,7 @@ void QPainterPrivate::updateState(QPainterState *newState) of composition modes, brushes, clipping, transformation, etc, is close to an impossible task because of the number of permutations. As a compromise we have selected a subset of the - QPainter API and backends, were performance is guaranteed to be as + QPainter API and backends, where performance is guaranteed to be as good as we can sensibly get it for the given combination of hardware and software. |