diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-12 13:00:30 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 13:09:19 +0200 |
| commit | 17511e199f82ffb9e245fbed3872c9c73bcf2a00 (patch) | |
| tree | 16ffc4fa035d956ceb42fda8759a952e6600b618 /src | |
| parent | 2ce969d7f00483991e9727c201dc3144b6efa281 (diff) | |
Fixed auto-test failure in tst_QOpenGL.
QOpenGLFramebufferObject::height() was returning the width...
Change-Id: I521c2df02e00015998dc31a74481113af26e1ba6
Reviewed-on: http://codereview.qt-project.org/4663
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/opengl/qopenglframebufferobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.h b/src/gui/opengl/qopenglframebufferobject.h index e25ec6b15c..17ee74aa94 100644 --- a/src/gui/opengl/qopenglframebufferobject.h +++ b/src/gui/opengl/qopenglframebufferobject.h @@ -93,7 +93,7 @@ public: bool release(); int width() const { return size().width(); } - int height() const { return size().width(); } + int height() const { return size().height(); } GLuint texture() const; QSize size() const; |