diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-27 15:19:28 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-27 15:19:28 (GMT) |
| commit | 162892030766ffe8711888ea9e8d3a368c6a75b2 (patch) | |
| tree | ddfda2e163fdce5d7ead7ac1fbd7aedb4bb06b79 /doc/src/platforms | |
| parent | 0bc91ae61b07751f44210e1b772679c0a180c900 (diff) | |
| parent | 26b8b6783afe2c1c9f27c935eb46c05229757af1 (diff) | |
| download | Qt-162892030766ffe8711888ea9e8d3a368c6a75b2.zip Qt-162892030766ffe8711888ea9e8d3a368c6a75b2.tar.gz Qt-162892030766ffe8711888ea9e8d3a368c6a75b2.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Diffstat (limited to 'doc/src/platforms')
| -rw-r--r-- | doc/src/platforms/emb-displaymanagement.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/platforms/emb-displaymanagement.qdoc b/doc/src/platforms/emb-displaymanagement.qdoc index 8a743b1..05267c1 100644 --- a/doc/src/platforms/emb-displaymanagement.qdoc +++ b/doc/src/platforms/emb-displaymanagement.qdoc @@ -152,7 +152,7 @@ \row \o \c offset=<x,y> \o Multi - \o Specifies the coordinates of a subscreens top-left corner + \o Specifies the coordinates of a subscreen's top-left corner (by default 0,0). \endtable |