diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-19 15:54:46 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-19 15:54:46 (GMT) |
commit | e9dec649afc2e513354c79f6e38ca53b6943cccc (patch) | |
tree | c3947491e089a1d1d82148481c80ab4e46a49741 /src/gui/embedded | |
parent | 92b47ba61809de30eed205e7d1eafb1cde1087e1 (diff) | |
parent | 90b4f0ca7b9fe21f6c4b39a80f8f9cf98626690a (diff) | |
download | Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.zip Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.tar.gz Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/embedded')
-rw-r--r-- | src/gui/embedded/qscreen_qws.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp index ff48403..f3f54d9 100644 --- a/src/gui/embedded/qscreen_qws.cpp +++ b/src/gui/embedded/qscreen_qws.cpp @@ -1396,7 +1396,7 @@ QImage::Format QScreenPrivate::preferredImageFormat() const altered. Note that the default implementations of these functions do nothing. - Reimplement the the mapFromDevice() and mapToDevice() functions to + Reimplement the mapFromDevice() and mapToDevice() functions to map objects from the framebuffer coordinate system to the coordinate space used by the application, and vice versa. Be aware that the default implementations simply return the given objects |