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

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (73 commits)
  Rhys Weatherley's changes for 4.6.2
  Autotest: to be sure, generate .cpp files with the proper headers too
  Adjust rw base address for gui built with GCCE for Symbian OS
  Added descriptions of translatable strings for Phonon MMF reverb effect
  Corrected namespace for Phonon::MMF translatable error strings
  Compile fix for non-Symbian compilers
  revert to fromUtf16() usage in fromWCharArray()
  S60 softkey refactoring (support for merging, priorities and menus)
  Implementation for QVGPixmapData to/fromSymbianCFbsBitmap
  Updated changlog 4.6.2
  Fix license headers on these new files (and the generator).
  Add auto-generated tests for QScriptValue
  Add changes for 4.6.2
  Assistant examples: Fix missing QLatin1String.
  Changelog: Added Designer/uic3 changes for 4.6.2
  Revert "Improve raster graphics system performance on Mac."
  Added Czech translations.
  Introduce of QScriptValue autotest generator.
  Revert "Update default FPU flags on Symbian to be softvfp+vfpv2"
  Fixed potential crash in mac style
  ...

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();