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, 5 insertions, 3 deletions

diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index cea259c84a..21a530e44c 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -2269,6 +2269,7 @@ void tst_QAccessibility::scrollBarTest()
     delete scrollBarInterface;
     delete scrollBar;
 
+
     // Test that the rects are ok.
     {
         QScrollBar *scrollBar  = new QScrollBar(Qt::Horizontal);
@@ -2289,7 +2290,6 @@ void tst_QAccessibility::scrollBarTest()
 
         const QRect scrollBarRect = scrollBarInterface->rect(0);
         QVERIFY(scrollBarRect.isValid());
-
         // Verify that the sub-control rects are valid and inside the scrollBar rect.
         for (int i = LineUp; i <= LineDown; ++i) {
             const QRect testRect = scrollBarInterface->rect(i);
@@ -3469,14 +3469,15 @@ void tst_QAccessibility::tableWidgetTest()
 {
 #ifdef QTEST_ACCESSIBILITY
     {
-    QTableWidget *w = new QTableWidget(8,4);
+    QWidget *topLevel = new QWidget;
+    QTableWidget *w = new QTableWidget(8,4,topLevel);
     for (int r = 0; r < 8; ++r) {
         for (int c = 0; c < 4; ++c) {
             w->setItem(r, c, new QTableWidgetItem(tr("%1,%2").arg(c).arg(r)));
         }
     }
     w->resize(100, 100);
-    w->show();
+    topLevel->show();
 #if defined(Q_WS_X11)
     qt_x11_wait_for_window_manager(w);
     QTest::qWait(100);
@@ -3503,6 +3504,7 @@ void tst_QAccessibility::tableWidgetTest()
     delete view;
     delete client;
     delete w;
+    delete topLevel;
     }
     QTestAccessibility::clearEvents();
 #else