Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Add auto-generated tests for QScriptValue
  Add changes for 4.6.2
  Changelog: Added Designer/uic3 changes for 4.6.2
  Revert "Improve raster graphics system performance on Mac."
  Introduce of QScriptValue autotest generator.
  Fixed potential crash in mac style
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 69dd29fbeb12d076741dce70ac6bc155101ccd6f )
  Remove PrintDialog frame on Mac
  Fix missing non-unified toolbar margins on Mac
  Add a warning when there are duplicate aliases in a resource file.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a733444d3be6605552471f047558927495ff62b7 )
  Improve raster graphics system performance on Mac.
  Fixed compile of framecapture, simpleselector for symbian-abld winscw.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/gui/widgets/qprintpreviewwidget.cpp b/src/gui/widgets/qprintpreviewwidget.cpp
index 747a227..45b15ef 100644
--- a/src/gui/widgets/qprintpreviewwidget.cpp
+++ b/src/gui/widgets/qprintpreviewwidget.cpp
@@ -151,7 +151,11 @@ class GraphicsView : public QGraphicsView
 public:
     GraphicsView(QWidget* parent = 0)
         : QGraphicsView(parent)
-        {}
+    {
+#ifdef Q_WS_MAC
+        setFrameStyle(QFrame::NoFrame);
+#endif
+    }
 signals:
     void resized();