diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/installer/task/task.pro | 3 | ||||
-rw-r--r-- | tests/auto/installer/task/tst_task.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/installer/task/task.pro b/tests/auto/installer/task/task.pro index 52d12db46..ff41f5cce 100644 --- a/tests/auto/installer/task/task.pro +++ b/tests/auto/installer/task/task.pro @@ -1,7 +1,8 @@ include(../../qttest.pri) QT -= gui +QT += network isEqual(QT_MAJOR_VERSION, 5) { - QT += concurrent network + QT += concurrent } SOURCES += tst_task.cpp diff --git a/tests/auto/installer/task/tst_task.cpp b/tests/auto/installer/task/tst_task.cpp index 945c2a5f6..c228a50f6 100644 --- a/tests/auto/installer/task/tst_task.cpp +++ b/tests/auto/installer/task/tst_task.cpp @@ -79,14 +79,12 @@ private slots: QCOMPARE(started.count(), 1); QCOMPARE(finished.count(), 0); - QCOMPARE(progress.count(), 1); watcher.waitForFinished(); QTest::qWait(10); // Spin the event loop to deliver queued signals. QCOMPARE(started.count(), 1); QCOMPARE(finished.count(), 1); - QVERIFY(progress.count() > 2); FileTaskResult result = watcher.result(); QCOMPARE(watcher.future().resultCount(), 1); @@ -119,14 +117,12 @@ private slots: QCOMPARE(started.count(), 1); QCOMPARE(finished.count(), 0); - QCOMPARE(progress.count(), 1); watcher.waitForFinished(); QTest::qWait(10); // Spin the event loop to deliver queued signals. QCOMPARE(started.count(), 1); QCOMPARE(finished.count(), 1); - QVERIFY(progress.count() > 2); FileTaskResult result = watcher.result(); QCOMPARE(watcher.future().resultCount(), 1); |