Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	configure.exe

4 files changed, 9 insertions, 6 deletions

diff --git a/tests/auto/macplist/tst_macplist.cpp b/tests/auto/macplist/tst_macplist.cpp
index 7a2b1d8..aa52b95 100644
--- a/tests/auto/macplist/tst_macplist.cpp
+++ b/tests/auto/macplist/tst_macplist.cpp
@@ -171,7 +171,6 @@ void tst_MacPlist::test_plist()
     QVERIFY(dir.cdUp());
     QVERIFY(dir.cdUp());
     QVERIFY(dir.cdUp());
-    QVERIFY(dir.cdUp());
     QVERIFY(dir.cd(QLatin1String("app")));
     QVERIFY(dir.cd(QLatin1String("app.app")));
     QVERIFY(dir.cd(QLatin1String("Contents")));
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index 810be04..da97c7d 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -2371,7 +2371,7 @@ void tst_QComboBox::task260974_menuItemRectangleForComboBoxPopup()
         comboBox.showPopup();
         QTest::qWait(100);
 
-        QVERIFY(style.discoveredRect.width() <= comboBox.width());
+        QTRY_VERIFY(style.discoveredRect.width() <= comboBox.width());
     }
 }
 
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index 6c1ac54..5cb9173 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -3072,9 +3072,11 @@ void tst_QGraphicsView::scrollAfterResize_data()
     QTest::addColumn<QTransform>("x2");
     QTest::addColumn<QTransform>("x3");
 
-    int frameWidth = qApp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
-    int extent = qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
-    int inside = qApp->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents);
+    QPlastiqueStyle style;
+
+    int frameWidth = style.pixelMetric(QStyle::PM_DefaultFrameWidth);
+    int extent = style.pixelMetric(QStyle::PM_ScrollBarExtent);
+    int inside = style.styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents);
     int viewportWidth = 300;
     int scrollBarIndent = viewportWidth - extent - (inside ? 4 : 2)*frameWidth;
 
@@ -3095,7 +3097,9 @@ void tst_QGraphicsView::scrollAfterResize()
     QFETCH(QTransform, x2);
     QFETCH(QTransform, x3);
 
+    QPlastiqueStyle style;
     QGraphicsView view;
+    view.setStyle(&style);
     if (reverse)
         view.setLayoutDirection(Qt::RightToLeft);
 
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index 0291f66..cff6487 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -1164,7 +1164,7 @@ void tst_QProcess::softExitInSlots()
         SoftExitProcess proc(i);
         proc.start(appName);
         proc.write("OLEBOLE", 8); // include the \0
-        QTestEventLoop::instance().enterLoop(1);
+        QTestEventLoop::instance().enterLoop(10);
         QCOMPARE(proc.state(), QProcess::NotRunning);
         QVERIFY(proc.waitedForFinished);
     }