Merge branch 4.7 into qt-4.8-from-4.7

Conflicts:
	doc/src/index.qdoc
	src/xmlpatterns/expr/qevaluationcache_p.h

1 files changed, 1 insertions, 12 deletions

diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 807f68e..256e34b 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -235,22 +235,11 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
     QSize oldSize(q->size());
     QRect oldGeom(data.crect);
 
-    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 = S60->clientRect();
-        w = qMin(w, r.Width());
-        h = qMin(h, r.Height());
-
-        if (w == r.Width() && h == r.Height())
-            checkExtra = false;
-    }
-
     // Lose maximized status if deliberate resize
     if (w != oldSize.width() || h != oldSize.height())
         data.window_state &= ~Qt::WindowMaximized;
 
-    if (checkExtra && extra) {  // any size restrictions?
+    if (extra) {                                // any size restrictions?
         w = qMin(w,extra->maxw);
         h = qMin(h,extra->maxh);
         w = qMax(w,extra->minw);