Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits)
  Update internal state before emitting configurationChanged() signals.
  Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
  Fixed qmlshadersplugin on windows VC2008 toolchain.
  Reset input context in Symbian when another window is opened.
  KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
  Close context menus during orientation change.
  Have -small-screen enabled in certain examples on Symbian always.
  Update Japanese translations.
  Revert some of "Make QMLViewer startup animation stop after a while"
  Fix for winscw QtGui.def
  Add private method for flushing the pixmap cache.
  QDeclarative: Fix QPerformanceTimer on Symbian
  Fix QTreeWidget autotest cases on Symbian/VGA
  Increase SSL readbuffer 1 -> 16 kB
  Fix pixel metrics for Symbian VGA devices
  Revert "Fix QNetworkConfigurationManager usage outside main thread first"
  Avoid buffer overrun in QMacPixmapData resizing
  Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting
  Fix tst_QGraphicsItem::sorting() test case for Symbian
  Fix QHeaderView test case for VGA Symbian devices.
  ...

1 files changed, 9 insertions, 0 deletions

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 1bd9303408..5a566d1b76 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -2860,6 +2860,9 @@ void QPainter::setClipRect(const QRect &rect, Qt::ClipOperation op)
         return;
     }
 
+    if (d->state->clipOperation == Qt::NoClip && op == Qt::IntersectClip)
+        op = Qt::ReplaceClip;
+
     d->state->clipRegion = rect;
     d->state->clipOperation = op;
     if (op == Qt::NoClip || op == Qt::ReplaceClip)
@@ -2915,6 +2918,9 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
         return;
     }
 
+    if (d->state->clipOperation == Qt::NoClip && op == Qt::IntersectClip)
+        op = Qt::ReplaceClip;
+
     d->state->clipRegion = r;
     d->state->clipOperation = op;
     if (op == Qt::NoClip || op == Qt::ReplaceClip)
@@ -3320,6 +3326,9 @@ void QPainter::setClipPath(const QPainterPath &path, Qt::ClipOperation op)
         return;
     }
 
+    if (d->state->clipOperation == Qt::NoClip && op == Qt::IntersectClip)
+        op = Qt::ReplaceClip;
+
     d->state->clipPath = path;
     d->state->clipOperation = op;
     if (op == Qt::NoClip || op == Qt::ReplaceClip)