diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-08-11 08:07:59 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-08-11 08:07:59 (GMT) |
| commit | 02e0523fe2b1dfd08eadaf127023306f6aa64c6f (patch) | |
| tree | 26f374407ac0976e69f092517d69e1c93332492c /src/opengl/qgl.cpp | |
| parent | d501b04974df3615ac12fa93e11e893a44fbe715 (diff) | |
| parent | c7a18308a2725e4d1763777cb549f1ae74848005 (diff) | |
| download | Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.zip Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.gz Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.bz2 | |
Merge commit 'remotes/origin/4.7' into qt47s2
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 6120a85..4daa866 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1991,7 +1991,7 @@ struct DDSFormat { option helps preserve this default behavior. \omitvalue CanFlipNativePixmapBindOption Used by x11 from pixmap to choose - wether or not it can bind the pixmap upside down or not. + whether or not it can bind the pixmap upside down or not. \omitvalue MemoryManagedBindOption Used by paint engines to indicate that the pixmap should be memory managed along side with |