diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-24 08:52:29 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-24 08:52:29 (GMT) |
| commit | d32922a417f20fed56f6f4837d8bfdf2899e3d3c (patch) | |
| tree | 07aa5662fc96454a3ec0d0c2d85a2d061010675e /tests | |
| parent | b4f2e138422076ed5d615181fc336dbb90279935 (diff) | |
| parent | 9dadc219814cd9baaa4be4cee6ee2b3cf7df4a19 (diff) | |
| download | Qt-d32922a417f20fed56f6f4837d8bfdf2899e3d3c.zip Qt-d32922a417f20fed56f6f4837d8bfdf2899e3d3c.tar.gz Qt-d32922a417f20fed56f6f4837d8bfdf2899e3d3c.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h
src/3rdparty/webkit/WebCore/page/DragController.cpp
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
src/gui/painting/qpaintengineex_p.h
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qprocess/tst_qprocess.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index 1ae5b12..d235dff 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; @@ -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 |