Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
	bin/syncqt
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebCore/ChangeLog
	src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
	src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h
	src/3rdparty/webkit/WebCore/page/FrameView.cpp
	src/3rdparty/webkit/WebCore/page/FrameView.h
	src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
	src/3rdparty/webkit/WebCore/platform/ScrollView.h
	src/corelib/plugin/quuid.cpp
	src/gui/dialogs/qfontdialog.cpp
	src/multimedia/audio/qaudiodevicefactory.cpp
	src/opengl/qgl.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/qxmlquery/tst_qxmlquery.cpp

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index 49f110e..49a76fa 100644
--- a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
@@ -161,6 +161,7 @@ private slots:
     void draw();
     void update();
     void boundingRect();
+    void clippedBoundingRect();
     void deviceRect();
     void pixmap();
 
@@ -282,6 +283,20 @@ void tst_QGraphicsEffectSource::boundingRect()
     QTRY_COMPARE(effect->source()->boundingRect(), itemBoundingRect);
 }
 
+void tst_QGraphicsEffectSource::clippedBoundingRect()
+{
+    QRectF itemBoundingRect = item->boundingRect();
+    item->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
+
+    QGraphicsRectItem *child = new QGraphicsRectItem(-1000, -1000, 2000, 2000);
+    child->setBrush(Qt::red);
+    child->setParentItem(item);
+
+    effect->storeDeviceDependentStuff = true;
+    effect->source()->update();
+    QTRY_COMPARE(effect->source()->boundingRect(Qt::LogicalCoordinates), itemBoundingRect);
+}
+
 void tst_QGraphicsEffectSource::deviceRect()
 {
     effect->storeDeviceDependentStuff = true;