diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-07 04:40:54 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-07 04:40:54 (GMT) |
| commit | 93a2b57c7e3c2be5b1c64d3408d27acb4aa2c8fc (patch) | |
| tree | 5efe4f6c6386e25dc7d3235c7f261d3fdf5a19c3 /src/gui/painting/qpaintdevice.qdoc | |
| parent | 55a3fda3baf545cc7fbfa6b2c00705be40a7319b (diff) | |
| parent | 47008b211fe3b972077466e593a2a9016446bab2 (diff) | |
| download | Qt-93a2b57c7e3c2be5b1c64d3408d27acb4aa2c8fc.zip Qt-93a2b57c7e3c2be5b1c64d3408d27acb4aa2c8fc.tar.gz Qt-93a2b57c7e3c2be5b1c64d3408d27acb4aa2c8fc.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/tools/moc/generator.cpp
Diffstat (limited to 'src/gui/painting/qpaintdevice.qdoc')
| -rw-r--r-- | src/gui/painting/qpaintdevice.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc index ac1c3de..e923e90 100644 --- a/src/gui/painting/qpaintdevice.qdoc +++ b/src/gui/painting/qpaintdevice.qdoc @@ -82,7 +82,7 @@ horizontal and vertical resolution of the device in dots per inch. The physicalDpiX() and physicalDpiY() functions also return the resolution of the device in dots per inch, but note that if - the logical and vertical resolution differ, the corresponding + the logical and physical resolution differ, the corresponding QPaintEngine must handle the mapping. Finally, the colorCount() function returns the number of different colors available for the paint device. |