summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Hautakangas <ext-jani.hautakangas@nokia.com>2010-08-23 09:29:03 (GMT)
committerJani Hautakangas <ext-jani.hautakangas@nokia.com>2010-08-23 11:15:14 (GMT)
commita17e68fd66e9232f3d4e74543680b52277578f04 (patch)
treec8a05e08910ab83754a0931141709a642d45c59f
parent67e90b8a5701ef5b0653f012e74debc91e1b3b49 (diff)
downloadQt-a17e68fd66e9232f3d4e74543680b52277578f04.zip
Qt-a17e68fd66e9232f3d4e74543680b52277578f04.tar.gz
Qt-a17e68fd66e9232f3d4e74543680b52277578f04.tar.bz2
QWidget metadata has not been set up yet in QWidgetPrivate::init.
q->inherits("QGLWidget") gives incorrect result, so use QWidgetPrivate::isGLWidget variable instead. Reviewed-by: Jason Barron
-rw-r--r--src/gui/kernel/qwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 8b8641f..3d2bfe2 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1275,9 +1275,9 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
//give potential windows a bigger "pre-initial" size; create_sys() will give them a new size later
#ifdef Q_OS_SYMBIAN
- if(q->inherits("QGLWidget")) {
+ if (isGLWidget) {
// Don't waste GPU mem for unnecessary large egl surface
- data.crect = parentWidget ? QRect(0,0,2,2) : QRect(0,0,2,2);
+ data.crect = QRect(0,0,2,2);
} else {
data.crect = parentWidget ? QRect(0,0,100,30) : QRect(0,0,360,640);
}