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, 6 insertions, 2 deletions

diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 04b1e79..0396408 100644
--- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -48,6 +48,7 @@
 #endif
 
 #include <private/qstylesheetstyle_p.h>
+#include "../platformquirks.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -822,6 +823,8 @@ void tst_QStyleSheetStyle::focusColors()
 
 void tst_QStyleSheetStyle::hoverColors()
 {
+    if (!PlatformQuirks::haveMouseCursor())
+        QSKIP("No mouse Cursor on this platform",SkipAll);
     QList<QWidget *> widgets;
     widgets << new QPushButton("TESTING");
     widgets << new QLineEdit("TESTING");
@@ -979,10 +982,11 @@ void tst_QStyleSheetStyle::background()
 
 void tst_QStyleSheetStyle::tabAlignement()
 {
-    QTabWidget tabWidget;
+    QWidget topLevel;
+    QTabWidget tabWidget(&topLevel);
     tabWidget.addTab(new QLabel("tab1"),"tab1");
     tabWidget.resize(QSize(400,400));
-    tabWidget.show();
+    topLevel.show();
     QTest::qWaitForWindowShown(&tabWidget);
     QTest::qWait(50);
     QTabBar *bar = qFindChild<QTabBar*>(&tabWidget);