Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits)
  Give the toplevel widget a layout
  fix tests when using Qt in a namespace
  Fix tst_symbols auto test
  trivial: fix build
  Fix crash
  fix isLikelyToBeNfs usage
  Export isLikelyToBeNfs only if we have an internal build
  Fixed QGraphicsView autotest to use a dummy toplevel widget
  Fixed QMdiArea autotest to use a dummy toplevel widget.
  Fixed QMenuBar autotest. Changed window activation order.
  Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
  Fixed QPathCliper autotest, to skip a test when qreal != double
  Fixed QComboBox autotest to use a dummy toplevel widget
  Fixed QColumnView autotest. Added an QApplication::processEvents
  Fixed QAccessability autotest to use a dummy toplevel widget
  Fix QListWidget test
  Fix QGraphicsItems autotest
  Fixed QGraphicsScene autotest to use a dummy toplevel widget
  Fixed QGraphicsItem autotest to use a dummy toplevel widget
  Fixed QListView autotest to use a dummy toplevel widget
  ...

1 files changed, 1 insertions, 0 deletions

diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
index a6dd8be..99d11cc 100644
--- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
@@ -880,6 +880,7 @@ void tst_QPlainTextEdit::lineWrapModes()
     // We thus need to make it wide enough to show something visible.
     int minimumWidth = 2 * ed->document()->documentMargin();
     minimumWidth += ed->fontMetrics().width(QLatin1Char('a'));
+    minimumWidth += ed->frameWidth();
     ed->resize(minimumWidth, 1000);
     QCOMPARE(lineCount(), 26);
     ed->setParent(0);