Merge commit 'qt/master' into kinetic-graphicseffect

Conflicts:
	src/gui/graphicsview/graphicsview.pri
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsitem.h
	src/gui/graphicsview/qgraphicsitem_p.h
	src/gui/graphicsview/qgraphicsscene.cpp
	tests/auto/auto.pro

1 files changed, 1 insertions, 32 deletions

diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index 1ae5b12..1ffa360 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -147,7 +147,6 @@ private slots:
     void startFinishStartFinish();
     void invalidProgramString_data();
     void invalidProgramString();
-    void processEventsInAReadyReadSlot();
 
     // keep these at the end, since they use lots of processes and sometimes
     // caused obscure failures to occur in tests that followed them (esp. on the Mac)
@@ -161,7 +160,6 @@ protected slots:
     void restartProcess();
     void waitForReadyReadInAReadyReadSlotSlot();
     void waitForBytesWrittenInABytesWrittenSlotSlot();
-    void processEventsInAReadyReadSlotSlot();
     
 private:
     QProcess *process;
@@ -1226,7 +1224,7 @@ private:
 //-----------------------------------------------------------------------------
 void tst_QProcess::processInAThread()
 {
-    for (int i = 0; i < 3; ++i) {
+    for (int i = 0; i < 10; ++i) {
         TestThread thread;
         thread.start();
         QVERIFY(thread.wait(10000));
@@ -2136,35 +2134,6 @@ void tst_QProcess::invalidProgramString()
     QVERIFY(!QProcess::startDetached(programString));
 }
 
-//-----------------------------------------------------------------------------
-void tst_QProcess::processEventsInAReadyReadSlot()
-{
-#ifdef Q_OS_WINCE
-    QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
-#endif
-
-    QProcess process;
-    QVERIFY(QObject::connect(&process, SIGNAL(readyReadStandardOutput()), this, SLOT(processEventsInAReadyReadSlotSlot())));
-
-    for (int i = 0; i < 10; ++i) {
-        QCOMPARE(process.state(), QProcess::NotRunning);
-
-#ifdef Q_OS_MAC
-        process.start("testProcessOutput/testProcessOutput.app");
-#else
-        process.start("testProcessOutput/testProcessOutput");
-#endif
-
-        QVERIFY(process.waitForFinished(10000));
-    }
-}
-
-//-----------------------------------------------------------------------------
-void tst_QProcess::processEventsInAReadyReadSlotSlot()
-{
-    qApp->processEvents();
-}
-
 QTEST_MAIN(tst_QProcess)
 #include "tst_qprocess.moc"
 #endif