diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-08-18 09:01:28 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-08-18 09:01:28 (GMT) |
commit | d9b8c530fceced62ab620307f399c3e985640282 (patch) | |
tree | b53c8043d7c244437ec8655f4186e26f34ce7a5b /src/gui/kernel/qwidget_s60.cpp | |
parent | 182b10dbad23e9da310c0d600095f17c41dd0d3c (diff) | |
parent | 5e435bfcad5a05c775c9d45edbd2659c87416754 (diff) | |
download | Qt-d9b8c530fceced62ab620307f399c3e985640282.zip Qt-d9b8c530fceced62ab620307f399c3e985640282.tar.gz Qt-d9b8c530fceced62ab620307f399c3e985640282.tar.bz2 |
Merge remote-tracking branch 'mainline/4.8'
Diffstat (limited to 'src/gui/kernel/qwidget_s60.cpp')
-rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index d6aaa3f..807f68e 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -238,7 +238,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove) bool checkExtra = true; if (q->isWindow() && (data.window_state & (Qt::WindowFullScreen | Qt::WindowMaximized))) { // Do not allow fullscreen/maximized windows to expand beyond client rect - TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect(); + TRect r = S60->clientRect(); w = qMin(w, r.Width()); h = qMin(h, r.Height()); |