From 17511e199f82ffb9e245fbed3872c9c73bcf2a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 12 Sep 2011 13:00:30 +0200
Subject: 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>
---
 src/gui/opengl/qopenglframebufferobject.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/opengl')

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;
-- 
cgit v1.2.3