diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-21 13:08:20 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-11-21 13:08:20 +0300 |
| commit | 1c58b75ac26264bae4ef0da7c50841cb9aefa706 (patch) | |
| tree | 83e8cfe41d076bcbeb200a39e25f6ba6cd73269b /test | |
| parent | 8b45d1c928718db017faf9ce6c16ffea89c84bc6 (diff) | |
| parent | 41568c885d6f80a1691f382c46e13964d1cdb992 (diff) | |
Merge branch '1.7'
Diffstat (limited to 'test')
| -rw-r--r-- | test/testfolderwatcher.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test/testfolderwatcher.h b/test/testfolderwatcher.h index 3d69ee543..6915e506d 100644 --- a/test/testfolderwatcher.h +++ b/test/testfolderwatcher.h @@ -15,11 +15,6 @@ using namespace Mirall; -class FriendlyThread : public QThread -{ - friend class TestFolderWatcher; -}; - class TestFolderWatcher : public QObject { Q_OBJECT @@ -51,7 +46,7 @@ private: void processAndWait() { _loop.processEvents(); - FriendlyThread::msleep(200); + Utility::usleep(200000); _loop.processEvents(); } |