Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (378 commits)
  Updated DEF files for Symbian
  Designer: Remember default of main container's object name.
  Designer: Do not translate page object names of QMdiArea.
  qmake vcproj generator: do not insert $(INHERIT)
  Remove undefined symbol from tst_qwindowsurface.
  Fix def files
  Changes to driver workarounds.
  Switch to raster also when last window is destroyed (on MeeGo).
  Fixes detected by the static-check
  Fix accidental population of the disk cache with partial content
  Fix disk cache interaction for range retrieval HTTP requests.
  Fixup license headers in Lighthouse plugins
  Fixes: some text fields in PNG image files were not read
  Clipboard/Windows: Fix a hang when sending to non-responsive clients.
  Mac: add autorelease pools to create_sys
  Don't skip remaining events on unhandled events in xcb backend.
  PathView doesn't update if preferred highlight range changes.
  Image.PreserveAspectFit has unexpected effect on Image's sourceSize
  Doc improvement for Image.fillMode.
  QDeclarativeView flickers when composited on MeeGo
  ...

1 files changed, 2 insertions, 1 deletions

diff --git a/src/gui/painting/qbackingstore_p.h b/src/gui/painting/qbackingstore_p.h
index 47387ab..39bf66c 100644
--- a/src/gui/painting/qbackingstore_p.h
+++ b/src/gui/painting/qbackingstore_p.h
@@ -262,7 +262,8 @@ private:
     }
 
     inline bool hasStaticContents() const
-    { return !staticWidgets.isEmpty() && windowSurface->hasStaticContentsSupport(); }
+    { return !staticWidgets.isEmpty() && windowSurface->hasStaticContentsSupport()
+        && windowSurface->hasPartialUpdateSupport(); }
 
     friend QRegion qt_dirtyRegion(QWidget *);
     friend class QWidgetPrivate;